From 794852278f00d531ee4a0f3a95c2a993e9ffe33d Mon Sep 17 00:00:00 2001
From: patthoyts <patthoyts@users.sourceforge.net>
Date: Tue, 31 Oct 2006 14:19:57 +0000
Subject: Fix for bug #1582769 - options conflict with VC2003.

---
 ChangeLog    | 4 ++++
 win/rules.vc | 9 ++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 5f44efa..39e286d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-31  Pat Thoyts  <patthoyts@users.sourceforge.net>
+
+	* win/rules.vc: Fix for bug #1582769 - options conflict with VC2003.
+
 2006-10-31  Donal K. Fellows  <dkf@users.sf.net>
 
 	* generic/tclBasic.c, generic/tclNamesp.c, generic/tclProc.c:
diff --git a/win/rules.vc b/win/rules.vc
index e4904de..732b226 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.26 2006/10/06 14:14:29 patthoyts Exp $
+# RCS: @(#) $Id: rules.vc,v 1.27 2006/10/31 14:19:57 patthoyts Exp $
 #------------------------------------------------------------------------------
 
 !ifndef _RULES_VC
@@ -31,7 +31,11 @@ _INSTALLDIR	= $(INSTALLDIR:/=\)
 !endif
 
 !ifndef MACHINE
+!if "$(CPU)" == "" || "$(CPU)" == "i386"
 MACHINE		= IX86
+!else
+MACHINE         = $(CPU)
+!endif
 !endif
 
 !ifndef CFG_ENCODING
@@ -123,9 +127,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
-- 
cgit v0.12