summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-04-13 19:42:25 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-04-13 19:42:25 (GMT)
commit1b47e77e7e06f634d2c9d7014d344d3de110ba7c (patch)
tree75ac8f87dbff26125e815fbf129ff2d441ff3368 /win
parentf2067061a65c27001d806ced018ed3d2a34a35de (diff)
parent03ceba547a22b69f50f302e737f783597d7f9276 (diff)
downloadtk-1b47e77e7e06f634d2c9d7014d344d3de110ba7c.zip
tk-1b47e77e7e06f634d2c9d7014d344d3de110ba7c.tar.gz
tk-1b47e77e7e06f634d2c9d7014d344d3de110ba7c.tar.bz2
[Bug 3517448] TclKit build fails (unresolved __strtoi64)
Diffstat (limited to 'win')
-rw-r--r--win/rules.vc11
1 files changed, 7 insertions, 4 deletions
diff --git a/win/rules.vc b/win/rules.vc
index e18dca9..20c967a 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -442,18 +442,21 @@ OPTDEFINES = $(OPTDEFINES) -DSTATIC_BUILD
OPTDEFINES = $(OPTDEFINES) -DTCL_NO_DEPRECATED
!endif
-!if $(DEBUG)
-OPTDEFINES = $(OPTDEFINES) -DTCL_CFG_DEBUG
-!elseif $(OPTIMIZING)
+!if !$(DEBUG)
+OPTDEFINES = $(OPTDEFINES) -DNDEBUG
+!if $(OPTIMIZING)
OPTDEFINES = $(OPTDEFINES) -DTCL_CFG_OPTIMIZED
!endif
+!endif
!if $(PROFILE)
OPTDEFINES = $(OPTDEFINES) -DTCL_CFG_PROFILED
!endif
!if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"
OPTDEFINES = $(OPTDEFINES) -DTCL_CFG_DO64BIT
!endif
-
+!if $(VCVERSION) < 1300
+OPTDEFINES = $(OPTDEFINES) -DNO_STRTOI64
+!endif
#----------------------------------------------------------
# Locate the Tcl headers to build against