diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | win/rules.vc | 7 |
2 files changed, 9 insertions, 2 deletions
@@ -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 cc43b7b..91fa444 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.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 @@ _INSTALLDIR = $(INSTALLDIR:/=\) !endif !ifndef MACHINE -!if "$(CPU)" == "" +!if "$(CPU)" == "" || "$(CPU)" == "i386" MACHINE = IX86 !else MACHINE = $(CPU) @@ -127,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 |