summaryrefslogtreecommitdiffstats
path: root/win/rules.vc
diff options
context:
space:
mode:
authornijtmans@users.sourceforge.net <jan.nijtmans>2012-04-13 19:42:25 (GMT)
committernijtmans@users.sourceforge.net <jan.nijtmans>2012-04-13 19:42:25 (GMT)
commit655d8f7c75afbab10c17c7d269292d53bdc2caaf (patch)
tree75ac8f87dbff26125e815fbf129ff2d441ff3368 /win/rules.vc
parent10cce64e29c1e7f6545bd5e79b203c7e12b85c74 (diff)
parenteabfa8459120e0f240760b76b4d1ed5a470c38f6 (diff)
downloadtk-655d8f7c75afbab10c17c7d269292d53bdc2caaf.zip
tk-655d8f7c75afbab10c17c7d269292d53bdc2caaf.tar.gz
tk-655d8f7c75afbab10c17c7d269292d53bdc2caaf.tar.bz2
[Bug 3517448] TclKit build fails (unresolved __strtoi64)
Diffstat (limited to 'win/rules.vc')
-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