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

  1. Index: rules.vc
  2. ===================================================================
  3. RCS file: /cvsroot/tcl/tcl/win/rules.vc,v
  4. retrieving revision 1.11.2.5
  5. retrieving revision 1.11.2.6
  6. diff -u -r1.11.2.5 -r1.11.2.6
  7. --- rules.vc 18 Oct 2006 08:49:33 -0000 1.11.2.5
  8. +++ rules.vc 31 Oct 2006 15:17:20 -0000 1.11.2.6
  9. @@ -11,7 +11,7 @@
  10. # Copyright (c) 2003-2006 Patrick Thoyts
  11. #
  12. #------------------------------------------------------------------------------
  13. -# RCS: @(#) $Id: rules.vc,v 1.11.2.5 2006/10/18 08:49:33 patthoyts Exp $
  14. +# RCS: @(#) $Id: rules.vc,v 1.11.2.6 2006/10/31 15:17:20 patthoyts Exp $
  15. #------------------------------------------------------------------------------
  16.  
  17. !ifndef _RULES_VC
  18. @@ -31,7 +31,7 @@
  19. !endif
  20.  
  21. !ifndef MACHINE
  22. -!if "$(CPU)" == ""
  23. +!if "$(CPU)" == "" || "$(CPU)" == "i386"
  24. MACHINE = IX86
  25. !else
  26. MACHINE = $(CPU)
  27. @@ -127,9 +127,12 @@
  28.  
  29. COMPILERFLAGS =-W3
  30.  
  31. +# In v13 -GL and -YX are incompatible.
  32. !if [nmakehlp -c -YX]
  33. +!if ![nmakehlp -c -GL]
  34. OPTIMIZATIONS = $(OPTIMIZATIONS) -YX
  35. !endif
  36. +!endif
  37.  
  38. !if "$(MACHINE)" == "IX86"
  39. ### test for pentium errata