diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-04-27 14:43:06 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-04-27 14:43:06 +0000 |
| commit | 63201701ee55eb10b1d6cbba887c75bbeba2c204 (patch) | |
| tree | ef6fa314d0d43d52554f41d322b56a3dcef949b3 | |
| parent | 1660e1015122b255ed99a43147f94124cc73184a (diff) | |
| download | ruby-63201701ee55eb10b1d6cbba887c75bbeba2c204.tar.gz ruby-63201701ee55eb10b1d6cbba887c75bbeba2c204.tar.xz ruby-63201701ee55eb10b1d6cbba887c75bbeba2c204.zip | |
* 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
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | win32/Makefile.sub | 5 | ||||
| -rw-r--r-- | win32/setup.mak | 1 |
3 files changed, 11 insertions, 2 deletions
@@ -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 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 |