diff --git a/README.md b/README.md index 917cc05..9612559 100644 --- a/README.md +++ b/README.md @@ -144,6 +144,7 @@ The term 'anyoli' means 'green' in the Maasai language, thus naming 'anyolite'. #### Usability +* Updated mruby to 3.3.0 * Added error messages when Rake fails at installing * Added error messages when mruby/MRI is missing @@ -168,6 +169,7 @@ until Anyolite 2 is released. * [ ] Discard postinstall option in favor of more sophisticated build script * [ ] Simplify building with custom options * [ ] Set optional arguments being keywords for method as default +* [ ] Add option for using either dynamic or static linking #### Usability diff --git a/Rakefile.rb b/Rakefile.rb index e400549..5d7b5bb 100644 --- a/Rakefile.rb +++ b/Rakefile.rb @@ -18,8 +18,8 @@ class AnyoliteConfig :implementation => "mruby", :build_path => "build", :rb_fork => "https://github.com/mruby/mruby", - :rb_release => "3.2.0", - :rb_minor => "3.2", + :rb_release => "3.3.0", + :rb_minor => "3.3", :rb_dir => "third_party", :rb_config => "utility/mruby_build_config.rb", :glue_dir => "glue/mruby", @@ -139,6 +139,7 @@ def set_option(name, value) if $config.implementation == "mruby" if ANYOLITE_COMPILER == :msvc GLUE_FILES.each do |name| + # NOTE: For later versions, add flag /MD for dynamic linking only system "cl /I \"#{$config.rb_dir}/#{$config.implementation}/include\" /D MRB_INT64 /c \"#{$config.glue_dir}/#{name}.c\" /Fo\"#{$config.build_path}/glue/#{$config.implementation}/#{name}.obj\"" end elsif ANYOLITE_COMPILER == :gcc diff --git a/config_files/anyolite_config_mruby.json b/config_files/anyolite_config_mruby.json index ec47522..be3cf18 100644 --- a/config_files/anyolite_config_mruby.json +++ b/config_files/anyolite_config_mruby.json @@ -2,8 +2,8 @@ "implementation": "mruby", "build_path": "build", "rb_fork": "https://github.com/mruby/mruby", - "rb_release": "3.2.0", - "rb_minor": "3.2.0", + "rb_release": "3.3.0", + "rb_minor": "3.3.0", "rb_dir": "third_party", "rb_config": "utility/mruby_build_config.rb", "glue_dir": "glue/mruby" diff --git a/utility/mruby_build_config.rb b/utility/mruby_build_config.rb index ca0800a..30a11af 100644 --- a/utility/mruby_build_config.rb +++ b/utility/mruby_build_config.rb @@ -2,6 +2,7 @@ if ENV['VisualStudioVersion'] || ENV['VSINSTALLDIR'] toolchain :visualcpp + # NOTE: If you want to use dynamic linking, change /MT to /MD instead conf.cc.flags = ["/nologo", "/W3", "/MT", "/O2", "/D_CRT_SECURE_NO_WARNINGS"] else toolchain :gcc