summaryrefslogtreecommitdiffstats
path: root/win/rules.vc
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-04-13 19:43:32 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-04-13 19:43:32 (GMT)
commit578d24f5e4a1bf583a68f41c0cd495b1604ae5e3 (patch)
tree78227fd3657cf8a82ed5472f08c9041bd53b48df /win/rules.vc
parent57de0a9ee630da1621a7b882a407bc8a7ebf8abe (diff)
parent4fd8766e0ea2002b54ad9cb9f6e42ac1499495f0 (diff)
downloadtk-578d24f5e4a1bf583a68f41c0cd495b1604ae5e3.zip
tk-578d24f5e4a1bf583a68f41c0cd495b1604ae5e3.tar.gz
tk-578d24f5e4a1bf583a68f41c0cd495b1604ae5e3.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 01e44e0..f2ee135 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -473,18 +473,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