Skip to content

Commit

Permalink
Updated mruby to 3.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Hadeweka committed Apr 22, 2024
1 parent 52b5bbb commit f85170d
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
5 changes: 3 additions & 2 deletions Rakefile.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions config_files/anyolite_config_mruby.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions utility/mruby_build_config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f85170d

Please sign in to comment.