diff options
| author | patthoyts <patthoyts@users.sourceforge.net> | 2006-10-31 14:45:03 (GMT) |
|---|---|---|
| committer | patthoyts <patthoyts@users.sourceforge.net> | 2006-10-31 14:45:03 (GMT) |
| commit | 8d7015bb21beafc5861e3f6524b9efeba029b585 (patch) | |
| tree | 5e46a32140b52ac1c774fb5714341f9f581df02b /win/rules.vc | |
| parent | e34deb0d94616657c46d94284fa5f773f2c02f77 (diff) | |
| download | tk-8d7015bb21beafc5861e3f6524b9efeba029b585.zip tk-8d7015bb21beafc5861e3f6524b9efeba029b585.tar.gz tk-8d7015bb21beafc5861e3f6524b9efeba029b585.tar.bz2 | |
Update to support ttk merge.
Diffstat (limited to 'win/rules.vc')
| -rw-r--r-- | win/rules.vc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/win/rules.vc b/win/rules.vc index 4217753..e5f59a1 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -11,7 +11,7 @@ # Copyright (c) 2003-2006 Patrick Thoyts # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: rules.vc,v 1.13 2006/10/19 00:48:26 patthoyts Exp $ +# RCS: @(#) $Id: rules.vc,v 1.14 2006/10/31 14:45:04 patthoyts Exp $ #------------------------------------------------------------------------------ !ifndef _RULES_VC @@ -31,7 +31,7 @@ _INSTALLDIR = $(INSTALLDIR:/=\) !endif !ifndef MACHINE -!if "$(CPU)" == "" +!if "$(CPU)" == "" || "$(CPU)" == "i386" MACHINE = IX86 !else MACHINE = $(CPU) @@ -131,9 +131,12 @@ DEBUGFLAGS = $(DEBUGFLAGS) -GZ COMPILERFLAGS =-W3 +# In v13 -GL and -YX are incompatible. !if [nmakehlp -c -YX] +!if ![nmakehlp -c -GL] OPTIMIZATIONS = $(OPTIMIZATIONS) -YX !endif +!endif !if "$(MACHINE)" == "IX86" ### test for pentium errata @@ -207,6 +210,7 @@ LOIMPACT = 0 TCL_USE_STATIC_PACKAGES = 0 USE_THREAD_ALLOC = 0 UNCHECKED = 0 +HAVE_UXTHEME_H = 1 !else !if [nmakehlp -f $(OPTS) "static"] !message *** Doing static @@ -262,6 +266,12 @@ UNCHECKED = 1 !else UNCHECKED = 0 !endif +!if [nmakehlp -f $(OPTS) "noxp"] +!message *** Exclude support for XP theme +HAVE_UXTHEME_H = 0 +!else +HAVE_UXTHEME_H = 1 +!endif !endif |