diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-10-24 12:58:42 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-10-24 12:58:42 +0000 |
commit | d45f226da9d3833d7351125b07ebaa9510622804 (patch) | |
tree | c99777e908e584ebe5464882ee920688f880235b /ext/win32ole | |
parent | 9c33e18ca03dd5fc0421e182f07e9dd2c9ee9c52 (diff) | |
download | ruby-d45f226da9d3833d7351125b07ebaa9510622804.tar.gz |
* configure.in (LIBPATHFLAG): avoid $ substitution.
[ruby-dev:18577]
* ext/extmk.rb (extmake): expand $srcdir.
* ext/win32ole/extconf.rb: should not override $CFLAGS, but
append.
* lib/mkmf.rb (config_string): use given config hash.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2991 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/win32ole')
-rw-r--r-- | ext/win32ole/extconf.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ext/win32ole/extconf.rb b/ext/win32ole/extconf.rb index f627fcabb4..c0dfd4c724 100644 --- a/ext/win32ole/extconf.rb +++ b/ext/win32ole/extconf.rb @@ -17,10 +17,8 @@ end case RUBY_PLATFORM when /mswin32/ - $CFLAGS='/W3' -when /mingw/ - $CFLAGS='-DNONAMELESSUNION' -when /cygwin/ - $CFLAGS='-DNONAMELESSUNION' + $CFLAGS += ' /W3' +when /cygwin/, /mingw/ + $defs << '-DNONAMELESSUNION' end create_win32ole_makefile |