summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-04-13 19:34:11 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-04-13 19:34:11 (GMT)
commit03ceba547a22b69f50f302e737f783597d7f9276 (patch)
tree467ffe3edb3de6314f177481e0c76f04de8fe22c /win
parent5a1c57dc0dca93c9e878f66be5632afe0937784e (diff)
downloadtk-03ceba547a22b69f50f302e737f783597d7f9276.zip
tk-03ceba547a22b69f50f302e737f783597d7f9276.tar.gz
tk-03ceba547a22b69f50f302e737f783597d7f9276.tar.bz2
[Bug 3517448] TclKit build fails (unresolved __strtoi64)
some more tkInt.decls formatting
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 b813668..69f9fc8 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -426,18 +426,21 @@ OPTDEFINES = $(OPTDEFINES) -DUSE_THREAD_ALLOC=1
OPTDEFINES = $(OPTDEFINES) -DSTATIC_BUILD
!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
#----------------------------------------------------------
# Get common info used when building extensions.