summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--win32/Makefile.sub5
-rw-r--r--win32/setup.mak1
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5c8533347f..70496ee735 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,12 @@
+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/tcltklib/tcltklib.c (ip_invoke_core): call Tcl's "::unknown"
- command when can't get information of target command.
+ command when can't get information of target command.
Mon Apr 25 01:18:43 2005 Tanaka Akira <akr@m17n.org>
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 0c1a8a9689..37ad8ff3b9 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 c92c08310f..3919bfafd6 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