summaryrefslogtreecommitdiff
path: root/ext/win32ole/extconf.rb
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-11 12:32:15 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-11 12:32:15 +0000
commit59a666a25f9c03320a5fcc5b576b86c3a87a9317 (patch)
tree1127cbbb39f5209e8ed953bc4ed340b0f16679c5 /ext/win32ole/extconf.rb
parent8a7aad995210ce7a66e9be4315693feb7756670a (diff)
* lib/mkmf.rb (try_func): accept variable address.
* ext/win32ole/extconf.rb: libuuid is needed on cygwin. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29746 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/win32ole/extconf.rb')
-rw-r--r--ext/win32ole/extconf.rb10
1 files changed, 8 insertions, 2 deletions
diff --git a/ext/win32ole/extconf.rb b/ext/win32ole/extconf.rb
index 893793382b..95f229b041 100644
--- a/ext/win32ole/extconf.rb
+++ b/ext/win32ole/extconf.rb
@@ -4,7 +4,13 @@
#----------------------------------
require 'mkmf'
-dir_config("win32")
+case RUBY_PLATFORM
+when /cygwin/
+ inc = nil
+ lib = '/usr/lib/w32api'
+end
+
+dir_config("win32", inc, lib)
SRCFILES=<<SRC
win32ole.c
@@ -19,7 +25,7 @@ end
def create_win32ole_makefile
if have_library("ole32") and
have_library("oleaut32") and
- have_library("uuid") and
+ have_library("uuid", "&CLSID_CMultiLanguage", "mlang.h") and
have_library("user32") and
have_library("kernel32") and
have_library("advapi32") and