[ruby-oci8-commit] [554] trunk/ruby-oci8: fix for compilation on Windows x64 by mingw64.

nobody at rubyforge.org nobody at rubyforge.org
Sat Mar 2 01:46:20 UTC 2013


Revision: 554
Author:   kubo
Date:     2013-03-02 01:46:19 +0000 (Sat, 02 Mar 2013)
Log Message:
-----------
fix for compilation on Windows x64 by mingw64.

Modified Paths:
--------------
    trunk/ruby-oci8/ChangeLog
    trunk/ruby-oci8/ext/oci8/oraconf.rb

Modified: trunk/ruby-oci8/ChangeLog
===================================================================
--- trunk/ruby-oci8/ChangeLog	2013-02-23 11:03:13 UTC (rev 553)
+++ trunk/ruby-oci8/ChangeLog	2013-03-02 01:46:19 UTC (rev 554)
@@ -1,3 +1,6 @@
+2013-03-02  KUBO Takehiro  <kubo at jiubao.org>
+	* ext/oci8/oraconf.rb: fix for compilation on Windows x64 by mingw64.
+
 2013-01-12  KUBO Takehiro  <kubo at jiubao.org>
 	* ext/oci8/oci8lib.c: export a main function for Solaris x86 (32-bit).
 	    When a main function is invisible from Oracle instant client

Modified: trunk/ruby-oci8/ext/oci8/oraconf.rb
===================================================================
--- trunk/ruby-oci8/ext/oci8/oraconf.rb	2013-02-23 11:03:13 UTC (rev 553)
+++ trunk/ruby-oci8/ext/oci8/oraconf.rb	2013-03-02 01:46:19 UTC (rev 554)
@@ -847,7 +847,7 @@
       unless File.exist?("#{@oracle_home}/OCI/INCLUDE/OCI.H")
         raise "'#{@oracle_home}/OCI/INCLUDE/OCI.H' does not exists. Please install 'Oracle Call Interface'."
       end
-      if RUBY_PLATFORM =~ /cygwin/
+      if RUBY_PLATFORM =~ /cygwin|mingw32/
         " \"-I#{@oracle_home}/OCI/INCLUDE\" -D_int64=\"long long\""
       else
         " \"-I#{@oracle_home}/OCI/INCLUDE\""
@@ -971,7 +971,7 @@
         raise 'failed'
       end
       @cflags = " \"-I#{inc_dir}\""
-      @cflags += " -D_int64=\"long long\"" if RUBY_PLATFORM =~ /cygwin/
+      @cflags += " -D_int64=\"long long\"" if RUBY_PLATFORM =~ /cygwin|mingw32/
       @libs = get_libs("#{ic_dir}/sdk/lib")
       ld_path = nil
     else



More information about the ruby-oci8-commit mailing list