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 | 6329fa50b69c3982488ed6b4ca593c8177ddaf40 (patch) | |
| tree | d188253eec175203bc4eafe2b144bed1a6bc7080 | |
| parent | be2020554745ea4f09ec54ad78e247e868c79cb5 (diff) | |
| download | ruby-6329fa50b69c3982488ed6b4ca593c8177ddaf40.tar.gz | |
* 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
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | win32/Makefile.sub | 5 | ||||
| -rw-r--r-- | win32/setup.mak | 1 |
3 files changed, 12 insertions, 3 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/tk/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 13:54:55 2005 speakillof <speakillof@yahoo.co.jp> @@ -10,7 +15,7 @@ Mon Apr 25 13:54:55 2005 speakillof <speakillof@yahoo.co.jp> Mon Apr 25 01:18:43 2005 Tanaka Akira <akr@m17n.org> - * oniguruma.h (OnigWarnFunc): add a variadic argument. + * oniguruma.h (OnigWarnFunc): add a variadic argument. [ruby-core:4751] Sat Apr 23 19:49:21 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> diff --git a/win32/Makefile.sub b/win32/Makefile.sub index fcebd80a85..abe454a2c9 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 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 |