* win32/Makefile.sub (OPTFLAGS): default global optimization to

disabled only for VC++6.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8389 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

ChangeLog

@@ -1,3 +1,8 @@
+Wed Apr 27 23:42:22 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub (OPTFLAGS): default global optimization to
+	  disabled only for VC++6.
+
 Tue Apr 26 22:58:00 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/tcltklib.c (ip_invoke_core): call Tcl's "::unknown"

win32/Makefile.sub

@@ -68,7 +68,10 @@ ARCH = $(PROCESSOR_ARCHITECTURE)
 DEBUGFLAGS = -Zi
 !endif
 !if !defined(OPTFLAGS)
-OPTFLAGS = -O2b2xg-
+OPTFLAGS = -O2b2x
+!if $(MSC_VER) < 1300
+OPTFLAGS = $(OPTFLAGS)g-
+!endif
 !endif
 !if !defined(OS)
 OS = mswin32

win32/setup.mak

@@ -108,6 +108,7 @@ int main(int argc, char **argv)
 MAJOR = RUBY_VERSION_MAJOR
 MINOR = RUBY_VERSION_MINOR
 TEENY = RUBY_VERSION_TEENY
+MSC_VER = _MSC_VER
 <<
 
 -generic-: nul