fxruby 1.6.28-x64-mingw32 → 1.6.29-x64-mingw32

data/examples/header.rb

@@ -55,7 +55,7 @@ class HeaderWindow < FXMainWindow
 
     # Document icon
     doc = nil
-    File.open(File.join("icons", "minidoc.png"), "rb") do |f|
+    File.open(File.expand_path("../icons/minidoc.png", __FILE__), "rb") do |f|
       doc = FXPNGIcon.new(getApp(), f.read)
     end
 

data/examples/hello2.rb

@@ -30,7 +30,7 @@ main = FXMainWindow.new(application, "Hello", nil, nil, DECOR_ALL)
 # on disk.
 
 icon = nil
-File.open(File.join("icons", "hello2.png"), "rb") { |f|
+File.open(File.expand_path("../icons/hello2.png", __FILE__), "rb") { |f|
   icon = FXPNGIcon.new(application, f.read)
 }
 

data/examples/iRAA.rb

@@ -1,4 +1,10 @@
-require 'soap/mapping'
+begin
+  require 'soap/mapping'
+rescue LoadError
+  warn("Sorry, at the moment this example is not working.")
+  sleep(5)
+  exit(false)
+end
 
 
 module RAA; extend SOAP

data/examples/iconlist.rb

@@ -6,15 +6,9 @@ class IconListWindow < FXMainWindow
 
   # Load the named PNG icon from a file
   def loadIcon(filename)
-    begin
-      filename = File.join("icons", filename)
-      icon = nil
-      File.open(filename, "rb") do |f|
-        icon = FXPNGIcon.new(getApp(), f.read)
-      end
-      icon
-    rescue
-      raise RuntimeError, "Couldn't load icon: #{filename}"
+    filename = File.expand_path("../icons/#{filename}", __FILE__)
+    File.open(filename, "rb") do |f|
+      FXPNGIcon.new(getApp(), f.read)
     end
   end
 

data/examples/imageviewer.rb

@@ -240,15 +240,9 @@ class ImageWindow < FXMainWindow
 
   # Convenience function to construct a PNG icon
   def getIcon(filename)
-    begin
-      filename = File.join("icons", filename)
-      icon = nil
-      File.open(filename, "rb") do |f|
-        icon = FXPNGIcon.new(getApp(), f.read)
-      end
-      icon
-    rescue
-      raise RuntimeError, "Couldn't load icon: #{filename}"
+    filename = File.expand_path("../icons/#{filename}", __FILE__)
+    File.open(filename, "rb") do |f|
+      FXPNGIcon.new(getApp(), f.read)
     end
   end
 

data/examples/mditest.rb

@@ -64,7 +64,7 @@ class MDITestWindow  < FXMainWindow
 
     # Icon for MDI Child
     @mdiicon = nil
-    File.open(File.join("icons", "penguin.png"), "rb") do |f|
+    File.open(File.expand_path("../icons/penguin.png", __FILE__), "rb") do |f|
       @mdiicon = FXPNGIcon.new(getApp(), f.read)
     end
 

data/examples/raabrowser.rb

@@ -1,6 +1,12 @@
 require 'fox16'
-require 'cgi'
-require 'soap/wsdlDriver'
+begin
+  require 'cgi'
+  require 'soap/wsdlDriver'
+rescue LoadError
+  warn("Sorry, at the moment this example is not working.")
+  sleep(5)
+  exit(false)
+end
 
 include Fox
 

data/examples/rmagick.rb

@@ -1,5 +1,11 @@
 require 'fox16'
-require 'RMagick'
+begin
+  require 'RMagick'
+rescue LoadError
+  warn("LoadError: To execute this app you need to have 'RMagick' gem installed.")
+  sleep(5)
+  exit(false)
+end
 
 include Fox
 

data/examples/shutter.rb

@@ -28,15 +28,9 @@ class ShutterWindow < FXMainWindow
   # and constructs and returns a ICO icon object.
 
   def loadIcon(filename)
-    begin
-      filename = File.join("icons", filename)
-      icon = nil
-      File.open(filename, "rb") do |f|
-        icon = FXICOIcon.new(getApp(), f.read)
-      end
-      icon
-    rescue
-      raise RuntimeError, "Couldn't load icon: #{filename}"
+    filename = File.expand_path("../icons/#{filename}", __FILE__)
+    File.open(filename, "rb") do |f|
+      FXPNGIcon.new(getApp(), f.read)
     end
   end
 

data/examples/splitter.rb

@@ -8,15 +8,9 @@ class SplitterWindow < FXMainWindow
 
   # Convenience function to load & construct an icon
   def makeIcon(filename)
-    begin
-      filename = File.join("icons", filename)
-      icon = nil
-      File.open(filename, "rb") do |f|
-        icon = FXPNGIcon.new(getApp(), f.read)
-      end
-      icon
-    rescue
-      raise RuntimeError, "Couldn't load icon: #{filename}"
+    filename = File.expand_path("../icons/#{filename}", __FILE__)
+    File.open(filename, "rb") do |f|
+      FXPNGIcon.new(getApp(), f.read)
     end
   end
 

data/examples/table.rb

@@ -7,6 +7,28 @@ include Fox
 
 class TableWindow < FXMainWindow
 
+
+  class MyFXTable < Fox::FXTable
+    include Responder
+    def initialize(*args, &block)
+      super
+      FXMAPFUNC(SEL_COMMAND, FXTable::ID_PASTE_SEL, 'onCmdPasteSel')
+    end
+    def onCmdPasteSel(sender, sel, ptr)
+      data = getDNDData(FROM_CLIPBOARD, FXTable.utf8Type)
+      if data && anythingSelected?
+        rows_cols = data.split("\n").map{|l| l.split("\t") }
+        rows_cols.each.with_index(selStartRow) do |cols, row_nr|
+          cols.each.with_index(selStartColumn) do |text, col_nr|
+            setItemText( row_nr, col_nr, text)
+          end
+        end
+        max_cols = rows_cols.inject(0){|s,cols| [s, cols.length].max }
+        selectRange(selStartRow, selStartRow+rows_cols.length-1, selStartColumn, selStartColumn+max_cols-1)
+      end
+    end
+  end
+
   def initialize(app)
     # Call the base class initializer first
     super(app, "Table Widget Test", :opts => DECOR_ALL)
@@ -16,7 +38,7 @@ class TableWindow < FXMainWindow
 
     # Icon used in some cells
     penguinicon = nil
-    File.open(File.join('icons', 'penguin.png'), 'rb') do |f|
+    File.open(File.expand_path('../icons/penguin.png', __FILE__), 'rb') do |f|
       penguinicon = FXPNGIcon.new(getApp(), f.read, 0, IMAGE_ALPHAGUESS)
     end
 
@@ -32,8 +54,9 @@ class TableWindow < FXMainWindow
     frame = FXVerticalFrame.new(contents,
       FRAME_SUNKEN|FRAME_THICK|LAYOUT_FILL_X|LAYOUT_FILL_Y, :padding => 0)
 
-    # Table
-    @table = FXTable.new(frame,
+    # Instead of the usual FXTable, we use a derived version, that allows us
+    # to paste "," into fields. A "," is used as column separator otherwise.
+    @table = MyFXTable.new(frame,
       :opts => TABLE_COL_SIZABLE|TABLE_ROW_SIZABLE|LAYOUT_FILL_X|LAYOUT_FILL_Y,
       :padding => 2)
 

data/examples/textedit/textedit.rb

@@ -3,9 +3,9 @@
 require 'fox16'
 require 'fox16/responder'
 require 'fox16/undolist'
-require 'prefdialog'
-require 'helpwindow'
-require 'commands'
+require_relative 'prefdialog'
+require_relative 'helpwindow'
+require_relative 'commands'
 
 include Fox
 

data/ext/fox16_c/FXRbApp.cpp

@@ -55,7 +55,7 @@ FXRbApp::FXRbApp(const FXchar* appname,const FXchar* vendor) : FXApp(appname,ven
 // Constructor that also calls FXApp::init()
 FXRbApp* FXRbApp::constructAndInit(const FXchar* appname,const FXchar* vendor){
   int argc=1;
-  static char* argv[]={"",0};
+  static char* argv[]={(char*)"",0};
   FXRbApp* app=new FXRbApp(appname,vendor);
   app->FXApp::init(argc,argv);
   return app;

data/ext/fox16_c/FXRuby.cpp

@@ -31,6 +31,9 @@
 #include "FXRbCommon.h"
 #include "impl.h"
 
+// SWIG runtime functions we need
+#include "swigruby.h"
+
 #ifdef __CYGWIN__
 #include <io.h>		// for get_osf_handle()
 #endif
@@ -63,7 +66,7 @@ swig_type_info *FXRbTypeQuery(const char *desc){
   static st_table *types=st_init_strtable();
   swig_type_info *typeinfo=0;
   if(st_lookup(types,reinterpret_cast<st_data_t>(const_cast<char*>(desc)),reinterpret_cast<st_data_t *>(&typeinfo))==0){
-    typeinfo=SWIG_Ruby_TypeQuery(desc);
+    typeinfo=SWIG_TypeQuery(desc);
     st_insert(types,reinterpret_cast<st_data_t>(strdup(desc)),reinterpret_cast<st_data_t>(typeinfo));
     }
   FXASSERT(typeinfo!=0);
@@ -168,12 +171,12 @@ bool FXRbIsInGC(const void* ptr){
 
 
 /**
- * FXRbConvertPtr() is just a wrapper around SWIG_Ruby_ConvertPtr().
+ * FXRbConvertPtr() is just a wrapper around SWIG_ConvertPtr().
  */
 
 void* FXRbConvertPtr(VALUE obj,swig_type_info* ty){
   void *ptr;
-  SWIG_Ruby_ConvertPtr(obj,&ptr,ty,1);
+  SWIG_ConvertPtr(obj,&ptr,ty,1);
   return ptr;
   }
 
@@ -463,17 +466,23 @@ FXuint FXRbNumberOfFXColors(VALUE string_or_ary){
   return len;
 }
 
-FXColor *FXRbConvertToFXColors(VALUE string_or_ary){
+FXColor *FXRbConvertToFXColors(VALUE string_or_ary, FXuint *opts){
   FXColor* pix=0;
   if(TYPE(string_or_ary) == T_ARRAY){
     if(FXMALLOC(&pix,FXColor,RARRAY_LEN(string_or_ary))){
+      *opts |= IMAGE_OWNED;
       for(long i=0; i<RARRAY_LEN(string_or_ary); i++){
         pix[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(string_or_ary,i)));
       }
     }
   }else{
-    if(FXMALLOC(&pix,FXColor,RSTRING_LEN(string_or_ary)/sizeof(FXColor))){
-      memcpy(pix, RSTRING_PTR(string_or_ary), RSTRING_LEN(string_or_ary));
+    if( *opts & IMAGE_OWNED ){
+      if(FXMALLOC(&pix,FXColor,RSTRING_LEN(string_or_ary)/sizeof(FXColor))){
+        memcpy(pix, RSTRING_PTR(string_or_ary), RSTRING_LEN(string_or_ary));
+      }
+    }else{
+      rb_str_modify(string_or_ary);
+      pix = (FXColor*)(RSTRING_PTR(string_or_ary));
     }
   }
   return pix;
@@ -1018,7 +1027,7 @@ void* FXRbGetExpectedData(VALUE recv,FXSelector key,VALUE value){
     case SEL_DND_MOTION:
     case SEL_DND_REQUEST:
     case SEL_PICKED:
-      SWIG_Ruby_ConvertPtr(value,&ptr,FXRbTypeQuery("FXEvent *"),1);
+      SWIG_ConvertPtr(value,&ptr,FXRbTypeQuery("FXEvent *"),1);
       return ptr;
     case SEL_IO_READ:
     case SEL_IO_WRITE:
@@ -1195,14 +1204,14 @@ void* FXRbGetExpectedData(VALUE recv,FXSelector key,VALUE value){
 
   if(type==SEL_CHANGED){
 	  if(obj->isMemberOf(FXMETACLASS(FXPicker))){
-			SWIG_Ruby_ConvertPtr(value,&ptr,FXRbTypeQuery("FXPoint *"),1);
+			SWIG_ConvertPtr(value,&ptr,FXRbTypeQuery("FXPoint *"),1);
 			return ptr;
 	    }
 		return 0;
     }
 
 	if(type==SEL_DRAGGED){
-	    SWIG_Ruby_ConvertPtr(value,&ptr,FXRbTypeQuery("FXEvent *"),1);
+	    SWIG_ConvertPtr(value,&ptr,FXRbTypeQuery("FXEvent *"),1);
 	    return ptr;
 	    }
 

data/ext/fox16_c/extconf.rb

@@ -72,16 +72,259 @@ def fxscintilla_support_suppressed?
   ARGV.include? "--without-fxscintilla"
 end
 
+def with_env(hash)
+  hash.each do |k, v|
+    ENV[k] = v
+  end
+  begin
+    yield
+  ensure
+    hash.each do |k, v|
+      ENV.delete(k)
+    end
+  end
+end
+
+LIBZ_VERSION = ENV['LIBZ_VERSION'] || '1.2.7'
+LIBZ_SOURCE_URI = "http://downloads.sourceforge.net/project/libpng/zlib/#{LIBZ_VERSION}/zlib-#{LIBZ_VERSION}.tar.bz2"
+
+LIBPNG_VERSION = ENV['LIBPNG_VERSION'] || '1.5.13'
+LIBPNG_SOURCE_URI = "http://prdownloads.sourceforge.net/libpng/libpng-#{LIBPNG_VERSION}.tar.gz"
+
+LIBJPEG_VERSION = ENV['LIBJPEG_VERSION'] || '8d'
+LIBJPEG_SOURCE_URI = "http://www.ijg.org/files/jpegsrc.v#{LIBJPEG_VERSION}.tar.gz"
+
+LIBTIFF_VERSION = ENV['LIBTIFF_VERSION'] || '4.0.3'
+LIBTIFF_SOURCE_URI = "http://download.osgeo.org/libtiff/tiff-#{LIBTIFF_VERSION}.tar.gz"
+
+LIBFOX_VERSION            = ENV['LIBFOX_VERSION'] || '1.6.49'
+LIBFOX_SOURCE_URI         = "http://ftp.fox-toolkit.org/pub/fox-#{LIBFOX_VERSION}.tar.gz"
+
+LIBFXSCINTILLA_VERSION            = ENV['LIBFXSCINTILLA_VERSION'] || '2.28.0'
+LIBFXSCINTILLA_SOURCE_URI         = "http://download.savannah.gnu.org/releases/fxscintilla/fxscintilla-#{LIBFXSCINTILLA_VERSION}.tar.gz"
+
 def do_rake_compiler_setup
-  if enable_config("win32-static-build")
+  if enable_config("win32-cross")
+    require 'mini_portile'
+
     dir_config("installed")
-    have_library( 'gdi32', 'CreateDC' ) && append_library( $libs, 'gdi32' )
-    have_library( 'opengl32' ) && append_library( $libs, 'opengl32' )
-    have_library( 'winspool', 'EnumPrintersA') && append_library( $libs, 'winspool' )
 
-    CONFIG['CC'] += "\nCXX=#{RbConfig::CONFIG["host"]}-g++" # Hack CXX into Makefile for cross compilation
+    libz_recipe = MiniPortile.new("libz", LIBZ_VERSION).tap do |recipe|
+      recipe.files = [LIBZ_SOURCE_URI]
+      recipe.target = portsdir = File.expand_path('../../../ports', __FILE__)
+      # Prefer host_alias over host in order to use i586-mingw32msvc as
+      # correct compiler prefix for cross build, but use host if not set.
+      recipe.host = RbConfig::CONFIG["host_alias"].empty? ? RbConfig::CONFIG["host"] : RbConfig::CONFIG["host_alias"]
+      class << recipe
+        def configure
+          Dir.chdir work_path do
+            mk = File.read 'win32/Makefile.gcc'
+            File.open 'win32/Makefile.gcc', 'wb' do |f|
+              f.puts "BINARY_PATH = #{path}/bin"
+              f.puts "LIBRARY_PATH = #{path}/lib"
+              f.puts "INCLUDE_PATH = #{path}/include"
+              mk.sub!(/^PREFIX\s*=\s*$/, "PREFIX = #{host}-")
+              f.puts mk
+            end
+          end
+        end
+
+        def configured?
+          Dir.chdir work_path do
+            !! (File.read('win32/Makefile.gcc') =~ /^BINARY_PATH/)
+          end
+        end
+
+        def compile
+          execute "compile", "make -f win32/Makefile.gcc SHARED_MODE=1"
+        end
+
+        def install
+          execute "install", "make -f win32/Makefile.gcc install SHARED_MODE=1"
+        end
+      end
+
+      checkpoint = File.join(portsdir, "#{recipe.name}-#{recipe.version}-#{recipe.host}.installed")
+      unless File.exist?(checkpoint)
+        recipe.cook
+        FileUtils.touch checkpoint
+      end
+      recipe.activate
+    end
+
+    libpng_recipe = MiniPortile.new("libpng", LIBPNG_VERSION).tap do |recipe|
+      recipe.files = [LIBPNG_SOURCE_URI]
+      recipe.target = portsdir = File.expand_path('../../../ports', __FILE__)
+      # Prefer host_alias over host in order to use i586-mingw32msvc as
+      # correct compiler prefix for cross build, but use host if not set.
+      recipe.host = RbConfig::CONFIG["host_alias"].empty? ? RbConfig::CONFIG["host"] : RbConfig::CONFIG["host_alias"]
+      recipe.configure_options = [
+        "--host=#{recipe.host}",
+        "--enable-shared",
+        "--disable-static",
+        ]
+
+      checkpoint = File.join(portsdir, "#{recipe.name}-#{recipe.version}-#{recipe.host}.installed")
+      unless File.exist?(checkpoint)
+        with_env(
+          'CPPFLAGS' => "-I#{libz_recipe.path}/include",
+          'LDFLAGS' => "-L#{libz_recipe.path}/lib"
+        ) do
+          recipe.cook
+          FileUtils.touch checkpoint
+        end
+      end
+      recipe.activate
+    end
+
+    libjpeg_recipe = MiniPortile.new("libjpeg", LIBJPEG_VERSION).tap do |recipe|
+      recipe.files = [LIBJPEG_SOURCE_URI]
+      recipe.target = portsdir = File.expand_path('../../../ports', __FILE__)
+      # Prefer host_alias over host in order to use i586-mingw32msvc as
+      # correct compiler prefix for cross build, but use host if not set.
+      recipe.host = RbConfig::CONFIG["host_alias"].empty? ? RbConfig::CONFIG["host"] : RbConfig::CONFIG["host_alias"]
+      recipe.configure_options = [
+        "--host=#{recipe.host}",
+        "--enable-shared",
+        "--disable-static",
+        ]
+
+      checkpoint = File.join(portsdir, "#{recipe.name}-#{recipe.version}-#{recipe.host}.installed")
+      unless File.exist?(checkpoint)
+        recipe.cook
+        FileUtils.touch checkpoint
+      end
+      recipe.activate
+    end
+
+    libtiff_recipe = MiniPortile.new("libtiff", LIBTIFF_VERSION).tap do |recipe|
+      recipe.files = [LIBTIFF_SOURCE_URI]
+      recipe.target = portsdir = File.expand_path('../../../ports', __FILE__)
+      # Prefer host_alias over host in order to use i586-mingw32msvc as
+      # correct compiler prefix for cross build, but use host if not set.
+      recipe.host = RbConfig::CONFIG["host_alias"].empty? ? RbConfig::CONFIG["host"] : RbConfig::CONFIG["host_alias"]
+      recipe.configure_options = [
+        "--host=#{recipe.host}",
+        "--enable-shared",
+        "--disable-static",
+        ]
+
+      checkpoint = File.join(portsdir, "#{recipe.name}-#{recipe.version}-#{recipe.host}.installed")
+      unless File.exist?(checkpoint)
+        recipe.cook
+        FileUtils.touch checkpoint
+      end
+      recipe.activate
+    end
+
+    libfox_recipe = MiniPortile.new("libfox", LIBFOX_VERSION).tap do |recipe|
+      recipe.files = [LIBFOX_SOURCE_URI]
+      recipe.target = portsdir = File.expand_path('../../../ports', __FILE__)
+      # Prefer host_alias over host in order to use i586-mingw32msvc as
+      # correct compiler prefix for cross build, but use host if not set.
+      recipe.host = RbConfig::CONFIG["host_alias"].empty? ? RbConfig::CONFIG["host"] : RbConfig::CONFIG["host_alias"]
+      recipe.configure_options = [
+        "--host=#{recipe.host}",
+        "--without-xft",
+        "--without-x",
+        "--enable-shared",
+        "--disable-static",
+        ]
+      class << recipe
+        def compile
+          # Add param -no-undefined to libtool to build a win32 shared lib
+          execute "compile", "#{ENV['MAKE'] || "make"} libFOX_1_6_la_LDFLAGS='-version-info 0:49:0 -export-dynamic -no-undefined'"
+        end
+      end
+
+      checkpoint = File.join(portsdir, "#{recipe.name}-#{recipe.version}-#{recipe.host}.installed")
+      unless File.exist?(checkpoint)
+        with_env(
+          "CPPFLAGS" => "-I#{libjpeg_recipe.path}/include -I#{libpng_recipe.path}/include -I#{libtiff_recipe.path}/include -I#{libz_recipe.path}/include",
+          "LDFLAGS" => "-L#{libjpeg_recipe.path}/lib -L#{libpng_recipe.path}/lib -L#{libtiff_recipe.path}/lib -L#{libz_recipe.path}/lib"
+        ) do
+          recipe.cook
+          FileUtils.touch checkpoint
+        end
+      end
+      recipe.activate
+    end
+
+    libfxscintills_recipe = MiniPortile.new("libfxscintilla", LIBFXSCINTILLA_VERSION).tap do |recipe|
+      recipe.files = [LIBFXSCINTILLA_SOURCE_URI]
+      recipe.target = portsdir = File.expand_path('../../../ports', __FILE__)
+      # Prefer host_alias over host in order to use i586-mingw32msvc as
+      # correct compiler prefix for cross build, but use host if not set.
+      recipe.host = RbConfig::CONFIG["host_alias"].empty? ? RbConfig::CONFIG["host"] : RbConfig::CONFIG["host_alias"]
+      recipe.configure_options = [
+        "--host=#{recipe.host}",
+        "--enable-shared",
+        "--disable-static",
+        ]
+      class << recipe
+        attr_accessor :libfox_path
+        def mk
+          "#{ENV['MAKE'] || "make"}"
+        end
+
+        def compile
+          execute "compile_lexers", "cd lexers && #{mk}"
+          execute "compile_lexlib", "cd lexlib && #{mk}"
+          execute "compile_src", "cd src && #{mk}"
+          execute "compile_fox", "cd fox && #{mk} libfxscintilla_la_LDFLAGS='-version-info 23:0:3 -export-dynamic -no-undefined -L#{libfox_path}/lib -lFOX-1.6'"
+        end
+
+        def install
+          execute "install", "cd fox && #{mk} install && cd ../include && #{mk} install"
+        end
+      end
+      recipe.libfox_path = libfox_recipe.path
+
+      checkpoint = File.join(portsdir, "#{recipe.name}-#{recipe.version}-#{recipe.host}.installed")
+      unless File.exist?(checkpoint)
+        recipe.cook
+        FileUtils.touch checkpoint
+      end
+      recipe.activate
+    end
+
+#     have_library( 'gdi32', 'CreateDC' ) && append_library( $libs, 'gdi32' )
+#     have_library( 'opengl32' ) && append_library( $libs, 'opengl32' )
+#     have_library( 'winspool', 'EnumPrintersA') && append_library( $libs, 'winspool' )
+
+#     dir_config('libz', "#{libz_recipe.path}/include", "#{libz_recipe.path}/lib")
+#     dir_config('libpng', "#{libpng_recipe.path}/include", "#{libpng_recipe.path}/lib")
+#     dir_config('libtiff', "#{libtiff_recipe.path}/include", "#{libtiff_recipe.path}/lib")
+#     dir_config('libjpeg', "#{libjpeg_recipe.path}/include", "#{libjpeg_recipe.path}/lib")
+    dir_config('libfox', "#{libfox_recipe.path}/include", "#{libfox_recipe.path}/lib")
+    dir_config('libfxscintilla', "#{libfxscintills_recipe.path}/include", "#{libfxscintills_recipe.path}/lib")
+
+    shared_dlls = [
+        "#{libfxscintills_recipe.path}/bin/libfxscintilla-20.dll",
+        "#{libfox_recipe.path}/bin/libFOX-1.6-0.dll",
+        "#{libjpeg_recipe.path}/bin/libjpeg-8.dll",
+        "#{libpng_recipe.path}/bin/libpng15-15.dll",
+        "#{libtiff_recipe.path}/bin/libtiff-5.dll",
+        "#{libz_recipe.path}/bin/zlib1.dll",
+      ]
+    shared_dlls.each do |dll|
+      FileUtils.cp dll, '.', verbose: true
+    end
+
+    gcc_shared_dlls = %w[libwinpthread-1.dll libgcc_s_dw2-1.dll libgcc_s_sjlj-1.dll libgcc_s_seh-1.dll libstdc++-6.dll]
+    gcc_shared_dlls.each do |dll|
+      cmd = "#{CONFIG['CC']} -print-file-name=#{dll}"
+      res = `#{cmd}`.chomp
+      next if dll == res
+      puts "#{cmd} => #{res}"
+      FileUtils.cp `#{cmd}`.chomp, '.', verbose: true
+    end
+
+    CONFIG['CXX'] = "#{RbConfig::CONFIG["host"]}-g++" # CXX setting must be prefixed for cross build
+    CONFIG['CC'] += "\nCXX=#{CONFIG['CXX']}" # Hack CXX into Makefile for cross compilation
     CONFIG['LDSHARED'].gsub!('gcc', 'g++') # ensure C++ linker is used, so that libstdc++ is linked static
-    $LDFLAGS += " -s -static-libgcc -static-libstdc++" # mingw-w64 v4.7 defaults to dynamic linking
+    $LDFLAGS += " -s" # remove symbol table informations from shared lib
+
   elsif RUBY_PLATFORM =~ /mingw/
     $CFLAGS = $CFLAGS + " -I/usr/local/include"
     $LDFLAGS = $LDFLAGS + " -I/usr/local/lib"
@@ -96,9 +339,8 @@ def do_rake_compiler_setup
   $libs = append_library($libs, "stdc++") unless RUBY_PLATFORM =~ /mingw/ || enable_config("win32-static-build")
   have_header("sys/time.h") unless RUBY_PLATFORM =~ /mingw/ || enable_config("win32-static-build")
   have_header("signal.h")
-  if have_library("z", "deflate")
-    have_library("png", "png_create_read_struct")
-  end
+  have_library("z", "deflate")
+  have_library("png", "png_create_read_struct")
   have_library("jpeg", "jpeg_mem_init")
   have_library("tiff", "TIFFSetErrorHandler")
   have_library("Xft", "XftInit")
@@ -106,11 +348,10 @@ def do_rake_compiler_setup
   find_library("X11", "XFindContext", "/usr/X11R6/lib")
   find_library("GL", "glXCreateContext", "/usr/X11R6/lib")
   find_library("GLU", "gluNewQuadric", "/usr/X11R6/lib")
-  $libs = append_library($libs, "FOX-1.6")
   $libs = append_library($libs, "Xrandr") unless RUBY_PLATFORM =~ /mingw/ || enable_config("win32-static-build")
   $libs = append_library($libs, "Xcursor") unless RUBY_PLATFORM =~ /mingw/ || enable_config("win32-static-build")
-  $libs = append_library($libs, "png")
   find_header('FXRbCommon.h', File.join(File.dirname(__FILE__), 'include'))
+  $libs = append_library($libs, "FOX-1.6")
   if is_fxscintilla_build?
     FileUtils.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exist?('scintilla_wrap.cpp.bak')
     $CPPFLAGS = $CPPFLAGS + " -DWITH_FXSCINTILLA -DHAVE_FOX_1_6"