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 | 8d7b49b2bdd2aefcbae660f481443f5a034119e7 (patch) | |
| tree | 68b609741cae53a9bc677ec5f2c9006e4c106a56 /win/rules.vc | |
| parent | 6c8cb35a1c6e63eb8bfa97fd9f1cb59821cbabbf (diff) | |
| parent | 48f4a5b67ddb0c79c4c19cf8cb380ce9010c06e8 (diff) | |
| download | tcl-8d7b49b2bdd2aefcbae660f481443f5a034119e7.zip tcl-8d7b49b2bdd2aefcbae660f481443f5a034119e7.tar.gz tcl-8d7b49b2bdd2aefcbae660f481443f5a034119e7.tar.bz2 | |
sync win/rules.vc with Tk version
Diffstat (limited to 'win/rules.vc')
| -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 |