diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-13 22:29:43 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-13 22:29:43 (GMT) |
| commit | 93e3a238d03fe4237ec76d361f83547cf268ab29 (patch) | |
| tree | 68b609741cae53a9bc677ec5f2c9006e4c106a56 | |
| parent | c7a20762743c94893cd815bed31fd8c83ee86b12 (diff) | |
| parent | d234be625eb4be7866809a9b1a58336a9c352794 (diff) | |
| download | tcl-93e3a238d03fe4237ec76d361f83547cf268ab29.zip tcl-93e3a238d03fe4237ec76d361f83547cf268ab29.tar.gz tcl-93e3a238d03fe4237ec76d361f83547cf268ab29.tar.bz2 | |
sync win/rules.vc with Tk version
| -rw-r--r-- | win/rules.vc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/win/rules.vc b/win/rules.vc index 316dc05..f2ee135 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -473,12 +473,11 @@ OPTDEFINES = $(OPTDEFINES) -DSTATIC_BUILD OPTDEFINES = $(OPTDEFINES) -DTCL_NO_DEPRECATED !endif -!if $(DEBUG) -OPTDEFINES = $(OPTDEFINES) -DTCL_CFG_DEBUG -!elseif $(OPTIMIZING) -OPTDEFINES = $(OPTDEFINES) -DTCL_CFG_OPTIMIZED -!else +!if !$(DEBUG) OPTDEFINES = $(OPTDEFINES) -DNDEBUG +!if $(OPTIMIZING) +OPTDEFINES = $(OPTDEFINES) -DTCL_CFG_OPTIMIZED +!endif !endif !if $(PROFILE) OPTDEFINES = $(OPTDEFINES) -DTCL_CFG_PROFILED @@ -486,7 +485,9 @@ OPTDEFINES = $(OPTDEFINES) -DTCL_CFG_PROFILED !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 |