diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-13 19:42:25 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-13 19:42:25 (GMT) |
| commit | 1b47e77e7e06f634d2c9d7014d344d3de110ba7c (patch) | |
| tree | 75ac8f87dbff26125e815fbf129ff2d441ff3368 | |
| parent | f2067061a65c27001d806ced018ed3d2a34a35de (diff) | |
| parent | 03ceba547a22b69f50f302e737f783597d7f9276 (diff) | |
| download | tk-1b47e77e7e06f634d2c9d7014d344d3de110ba7c.zip tk-1b47e77e7e06f634d2c9d7014d344d3de110ba7c.tar.gz tk-1b47e77e7e06f634d2c9d7014d344d3de110ba7c.tar.bz2 | |
[Bug 3517448] TclKit build fails (unresolved __strtoi64)
| -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 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 |