diff options
| author | jan.nijtmans <jan.nijtmans@noemail.net> | 2012-04-13 19:43:32 (GMT) |
|---|---|---|
| committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2012-04-13 19:43:32 (GMT) |
| commit | 8951463a8f66ac9af1c42f64d608556e3649d883 (patch) | |
| tree | 78227fd3657cf8a82ed5472f08c9041bd53b48df | |
| parent | 98a338d53d76cfe294611b4a28181de3c7732991 (diff) | |
| parent | 69c29f2ee3d785fab2f565ad8e408316dc968a31 (diff) | |
| download | tk-8951463a8f66ac9af1c42f64d608556e3649d883.zip tk-8951463a8f66ac9af1c42f64d608556e3649d883.tar.gz tk-8951463a8f66ac9af1c42f64d608556e3649d883.tar.bz2 | |
[Bug 3517448] TclKit build fails (unresolved __strtoi64)
FossilOrigin-Name: cbc8896878c70ffc43b29964139905975d15ab5a
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | win/rules.vc | 11 |
2 files changed, 12 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2012-04-13 Jan Nijtmans <nijtmans@users.sf.net> + + * win/rules.vc: [Bug 3517448] TclKit build fails (unresolved + __strtoi64) + 2012-04-07 Jan Nijtmans <nijtmans@users.sf.net> * generic/tkBind.c: [Bug 3176239] control-MouseWheel causes segv 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 |