From 63201701ee55eb10b1d6cbba887c75bbeba2c204 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 27 Apr 2005 14:43:06 +0000
Subject: * win32/Makefile.sub (OPTFLAGS): default global optimization to  
 disabled only for VC++6.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@8389 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 win32/Makefile.sub | 5 ++++-
 win32/setup.mak    | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'win32')

diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 0c1a8a968..37ad8ff3b 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -67,7 +67,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
-- 
cgit