1 files changed, 67 insertions, 14 deletions

diff --git a/core/mruby_build.rb b/core/mruby_build.rb
index 8a440c9..a0d0a56 100644
--- a/core/mruby_build.rb
+++ b/core/mruby_build.rb
@@ -75,24 +75,19 @@ MRuby::Build.new do |conf|
   # C compiler settings
   conf.cc do |cc|
     cc.command = 'zig cc -target native -O2'
+    cc.include_paths << ["#{configure_project_root}/vendor/tux/include"]
   end
 
   # Linker settings
   conf.linker do |linker|
     #linker.command = ENV['LD'] || 'gcc'
     linker.command = 'zig c++ -target native -O2'
-  end
-
-  conf.cxx.command = 'zig c++ -target native -O2'
-
-  conf.cc do |cc|
-    cc.include_paths << ["#{configure_project_root}/vendor/tux/include"]
-  end
-  conf.linker do |linker|
     linker.flags << ['-lraylib -lGL -lm -lpthread -ldl -lrt -lX11']
     linker.library_paths << ["#{configure_project_root}/vendor/tux/lib"]
   end
 
+  conf.cxx.command = 'zig c++ -target native -O2'
+
   # Turn on `enable_debug` for better debugging
   # conf.enable_debug
   conf.enable_bintest
@@ -158,32 +153,90 @@ MRuby::CrossBuild.new("tux") do |conf|
   conf.cxx.command = "zig c++ -target x86_64-linux-gnu"
 end
 =end
-=begin
 MRuby::CrossBuild.new("win") do |conf|
   conf.toolchain :clang
 
   disable_lock # disables being stuck on a single commit
 
-  # include the GEM box
-  conf.gembox 'felflame'
+  # -- CORE GEMS --
+  conf.gembox "stdlib"
+  conf.gembox "stdlib-ext"
+  conf.gembox "math"
+  conf.gembox "metaprog"
+  #conf.gembox "stdlib-io"
+
+  # Use standard IO/File class
+  conf.gem :core => "mruby-io"
+
+  # TODO: this gem doesnt current work
+  # with windows export
+  #conf.gem :core => "mruby-socket"
+
+  # Use standard print/puts/p
+  conf.gem :core => "mruby-print"
+
+  # Generate mrbc command
+  conf.gem :core => "mruby-bin-mrbc"
+
+  # Generate mirb command
+  conf.gem :core => "mruby-bin-mirb"
+
+  # Generate mruby command
+  conf.gem :core => "mruby-bin-mruby"
+
+  # Generate mruby-strip command
+  conf.gem :core => "mruby-bin-strip"
+
+  # Generate mruby-config command
+  conf.gem :core => "mruby-bin-config"
+
+  # -- POTENTIAL GEMS --
+  # gems that we may want incorperated
+
+  # Simple Http
+  #conf.gem :git => 'https://github.com/matsumotory/mruby-simplehttp'
+
+  # Memory Profiler
+  #conf.gem :git => 'https://github.com/iij/mruby-memprof'
+
+  # Testing Framework
+  #conf.gem :git => 'https://github.com/iij/mruby-mtest'
+
+  # Regex
+  #conf.gem :git => 'https://github.com/iij/mruby-regexp-pcre'
+
+  # JSON
+  #conf.gem :git => 'https://github.com/iij/mruby-iijson'
+
+  # Dir
+  #conf.gem :git => 'https://github.com/iij/mruby-dir'
+
+  # -- YOUR GEMS --
+  # gems added into the mrbgems directory
+
+  puts "HERE: #{File.expand_path(configure_mrbgem_dir)}"
+  Dir.each_child(configure_mrbgem_dir) do |mrb_gem|
+    conf.gem "#{configure_mrbgem_dir}/#{mrb_gem}"
+  end
+
+  # ---
 
   conf.host_target = "x86_64-w64-mingw32"
 
   conf.cc do |cc|
     cc.command = 'zig cc -target x86_64-windows-gnu'
-    cc.include_paths = ["#{root}/include", '../raylib/src']
+    cc.include_paths << ["#{configure_project_root}/vendor/win/include"]
   end
 
 
   conf.linker do |linker|
     linker.command = 'zig cc -target x86_64-windows-gnu'
     linker.flags = ['-lraylib -lwinmm -lgdi32 -lopengl32' ]
-    linker.library_paths = ['../raylib_lib_files']
+    linker.library_paths << ["#{configure_project_root}/vendor/win/lib"]
   end
 
   conf.cxx.command = "zig c++ -target x86_64-windows-gnu"
 end
-=end
 
 MRuby::CrossBuild.new("web") do |conf|
   conf.toolchain :clang