summaryrefslogtreecommitdiffstats
path: root/win/rules.vc
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)
commit4fd8766e0ea2002b54ad9cb9f6e42ac1499495f0 (patch)
tree75ac8f87dbff26125e815fbf129ff2d441ff3368 /win/rules.vc
parentc6f36b8a73bcb13733a83aa0f0098fa726768b61 (diff)
parentc3630385b1325ea8ed6a3066ca868fc131739a58 (diff)
downloadtk-4fd8766e0ea2002b54ad9cb9f6e42ac1499495f0.zip
tk-4fd8766e0ea2002b54ad9cb9f6e42ac1499495f0.tar.gz
tk-4fd8766e0ea2002b54ad9cb9f6e42ac1499495f0.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