Merge pull request #755 from masuidrive/imprive_build_scripts

Improved build scripts and config files

1 files changed, 5 insertions, 6 deletions

diff --git a/mrblib/mrblib.rake b/mrblib/mrblib.rake
index 5dab4cee9..493207db4 100644
--- a/mrblib/mrblib.rake
+++ b/mrblib/mrblib.rake
@@ -1,15 +1,14 @@
-dir = File.dirname(__FILE__).sub(%r|^\./|, '')
-
 MRuby.each_target do
-  self.libmruby << "#{build_dir}/#{dir}/mrblib.o"
+  dir = File.dirname(__FILE__).relative_path_from(root)
+  self.libmruby << objfile("#{build_dir}/#{dir}/mrblib")
 
-  file "#{build_dir}/#{dir}/mrblib.o" => "#{build_dir}/#{dir}/mrblib.c"
+  file objfile("#{build_dir}/#{dir}/mrblib") => "#{build_dir}/#{dir}/mrblib.c"
   file "#{build_dir}/#{dir}/mrblib.c" => [mrbcfile] + Dir.glob("#{dir}/*.rb") do |t|
-    mrbc, *rbfiles = t.prerequisites
+    mrbc_, *rbfiles = t.prerequisites
     FileUtils.mkdir_p File.dirname(t.name)
     open(t.name, 'w') do |f|
       f.puts File.read("#{dir}/init_mrblib.c")
-      compile_mruby f, rbfiles, 'mrblib_irep'
+      mrbc.run f, rbfiles, 'mrblib_irep'
     end
   end
 end