summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatthoyts <patthoyts@users.sourceforge.net>2006-10-31 15:18:28 (GMT)
committerpatthoyts <patthoyts@users.sourceforge.net>2006-10-31 15:18:28 (GMT)
commit325a929ec113b3300a023e5d07e93249c3f7ab2b (patch)
tree6058aee769405fca6529c9054e949fbe1dbd9989
parent9d406283c78b9b11cadbe52ab064de3bd95f4105 (diff)
downloadtk-325a929ec113b3300a023e5d07e93249c3f7ab2b.zip
tk-325a929ec113b3300a023e5d07e93249c3f7ab2b.tar.gz
tk-325a929ec113b3300a023e5d07e93249c3f7ab2b.tar.bz2
Fix bug #1582769 build with VC2003 and correct i386 arch.
-rw-r--r--ChangeLog4
-rw-r--r--win/rules.vc9
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index daaafc3..a7d96df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-31 Pat Thoyts <patthoyts@users.sourceforge.net>
+
+ * rules.vc: Fix bug #1582769 build with VC2003 and correct i386 arch.
+
2006-10-23 Don Porter <dgp@users.sourceforge.net>
* README: Bump version number to 8.4.15
diff --git a/win/rules.vc b/win/rules.vc
index bfe285e..235802e 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.5.2.7 2006/10/18 08:56:21 patthoyts Exp $
+# RCS: @(#) $Id: rules.vc,v 1.5.2.8 2006/10/31 15:18:28 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
@@ -497,7 +500,7 @@ TCLTOOLSDIR = $(_TCLDIR)\tools
!message *** Output directory will be '$(OUT_DIR)'
!message *** Suffix for binaries will be '$(SUFX)'
!message *** Optional defines are '$(OPTDEFINES)'
-!message *** Compiler version $(VCVER), arch is $(MACHINE)
+!message *** Compiler version $(VCVER)
!message *** Compiler options '$(OPTIMIZATIONS) $(DEBUGFLAGS)'
!message *** Link options '$(LINKERFLAGS)'