lib/blocks/compile.rb in bake-toolkit-2.63.2 vs lib/blocks/compile.rb in bake-toolkit-2.64.0

@@ -5,50 +5,55 @@
 require_relative '../common/ext/dir'
 require_relative '../common/utils'
 require_relative '../bake/toolchain/colorizing_formatter'
 require_relative '../bake/config/loader'
 
-
 begin
-require 'Win32API'
+  module Kernel32
+    require 'fiddle'
+    require 'fiddle/import'
+    require 'fiddle/types'
+    extend Fiddle::Importer
+    dlload 'kernel32'
+    include Fiddle::Win32Types
+    extern 'DWORD GetLongPathName(LPCSTR, LPSTR, DWORD)'
+    extern 'DWORD GetShortPathName(LPCSTR, LPSTR, DWORD)'
+  end
 
-def longname short_name
-  max_path = 1024
-  long_name = " " * max_path
-  lfn_size = Win32API.new("kernel32", "GetLongPathName", ['P','P','L'],'L').call(short_name, long_name, max_path)
-  return long_name[0..lfn_size-1]
-end
+  def longname short_name
+    max_path = 1024
+    long_name = " " * max_path
+    lfn_size = Kernel32.GetLongPathName(short_name, long_name, max_path)
+    return long_name[0..lfn_size-1]
+  end
 
-def shortname long_name
-  max_path = 1024
-  short_name = " " * max_path
-  lfn_size = Win32API.new("kernel32", "GetShortPathName", ['P','P','L'],'L').call(long_name, short_name, max_path)
-  return short_name[0..lfn_size-1]
-end
+  def shortname long_name
+    max_path = 1024
+    short_name = " " * max_path
+    lfn_size = Kernel32.GetShortPathName(long_name, short_name, max_path)
+    return short_name[0..lfn_size-1]
+  end
 
-def realname file
-    longname(shortname(file))
-end
+  def realname file
+    x = longname(shortname(file))
+  end
 
-rescue LoadError
+rescue Fiddle::DLError
 
-def realname file
+  def realname file
     file
-end
+  end
 
 end
 
 
-
-
-
 module Bake
 
   module Blocks
 
     class Compile < BlockBase
 
-      attr_reader :objects, :include_list, :source_files_ignored_in_lib, :object_files_ignored_in_lib
+      attr_reader :objects, :source_files, :include_list, :source_files_ignored_in_lib, :object_files_ignored_in_lib
 
       def mutex
         @mutex ||= Mutex.new
       end
 
\ No newline at end of file