Posted to tcl by patthoyts at Wed Apr 11 14:07:26 GMT 2007view pretty

Index: rules.vc
===================================================================
RCS file: /cvsroot/tcl/tcl/win/rules.vc,v
retrieving revision 1.11.2.5
retrieving revision 1.11.2.6
diff -u -r1.11.2.5 -r1.11.2.6
--- rules.vc    18 Oct 2006 08:49:33 -0000      1.11.2.5
+++ rules.vc    31 Oct 2006 15:17:20 -0000      1.11.2.6
@@ -11,7 +11,7 @@
 # Copyright (c) 2003-2006 Patrick Thoyts
 #
 #------------------------------------------------------------------------------
-# RCS: @(#) $Id: rules.vc,v 1.11.2.5 2006/10/18 08:49:33 patthoyts Exp $
+# RCS: @(#) $Id: rules.vc,v 1.11.2.6 2006/10/31 15:17:20 patthoyts Exp $
 #------------------------------------------------------------------------------

 !ifndef _RULES_VC
@@ -31,7 +31,7 @@
 !endif

 !ifndef MACHINE
-!if "$(CPU)" == ""
+!if "$(CPU)" == "" || "$(CPU)" == "i386"
 MACHINE                = IX86
 !else
 MACHINE         = $(CPU)
@@ -127,9 +127,12 @@

 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