diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-13 22:24:38 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-13 22:24:38 (GMT) |
| commit | d234be625eb4be7866809a9b1a58336a9c352794 (patch) | |
| tree | 5ddf371cf6df13cd21d47d5ecd1ea63c20eb4114 | |
| parent | 89c110fbb0e12918bbcb59f9d1a8c5503a5fa019 (diff) | |
| parent | 004c3152e32651a2491c2adbb107306c6c4c003d (diff) | |
| download | tcl-d234be625eb4be7866809a9b1a58336a9c352794.zip tcl-d234be625eb4be7866809a9b1a58336a9c352794.tar.gz tcl-d234be625eb4be7866809a9b1a58336a9c352794.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 63ecf01..20c967a 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -442,12 +442,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 @@ -455,7 +454,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 |