summaryrefslogtreecommitdiffstats
path: root/win32
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-04-27 14:43:06 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-04-27 14:43:06 +0000
commitb2900703701b31c6b31708f01c2affcf0fc546bb (patch)
treed188253eec175203bc4eafe2b144bed1a6bc7080 /win32
parent0b9bb498e66e2f0a97732e53ac33a5b0cd458f03 (diff)
downloadruby-b2900703701b31c6b31708f01c2affcf0fc546bb.tar.gz
ruby-b2900703701b31c6b31708f01c2affcf0fc546bb.tar.xz
ruby-b2900703701b31c6b31708f01c2affcf0fc546bb.zip
* win32/Makefile.sub (OPTFLAGS): default global optimization to
disabled only for VC++6. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8389 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile.sub5
-rw-r--r--win32/setup.mak1
2 files changed, 5 insertions, 1 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index fcebd80a8..abe454a2c 100644
--- a/win32/Makefile.sub
+++ b/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
diff --git a/win32/setup.mak b/win32/setup.mak
index c92c08310..3919bfafd 100644
--- a/win32/setup.mak
+++ b/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