summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederico Linhares <fred@linhares.blue>2024-01-05 16:47:12 -0300
committerFrederico Linhares <fred@linhares.blue>2024-01-05 16:47:12 -0300
commitac4045fffd8a4d106ba757009121ef09f48e2200 (patch)
tree4e1c1c07c0ec23a7e130a53fa85295faab3ec18c
parent21a0231e2dd5dfe526e8e68a544e6f9b549118fc (diff)
buil Use a newer version for mruby
-rw-r--r--Rakefile4
-rw-r--r--ruby_build_config.rb2
-rw-r--r--ruby_build_config.rb.lock4
-rw-r--r--src/core.cpp4
-rw-r--r--src/main.cpp4
5 files changed, 9 insertions, 9 deletions
diff --git a/Rakefile b/Rakefile
index c483907..377a77b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Frederico de Oliveira Linhares
+# Copyright 2022-2024 Frederico de Oliveira Linhares
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@ OBJ = 'candy_gear'
VERSION = '0.1.0'
-MRUBY_VERSION = '3.1.0'
+MRUBY_VERSION = '3.2.0'
MRUBY_ZIP_FILE = "mruby-#{MRUBY_VERSION}.zip"
MRUBY_STATIC_LIB = "mruby-#{MRUBY_VERSION}/build/host/lib/libmruby.a"
diff --git a/ruby_build_config.rb b/ruby_build_config.rb
index 4323e74..5992059 100644
--- a/ruby_build_config.rb
+++ b/ruby_build_config.rb
@@ -1,11 +1,11 @@
MRuby::Build.new do |conf|
conf.toolchain
+ conf.gem "#{Dir.pwd}/mrbgems/mruby-struct"
conf.gembox "math"
conf.gembox "metaprog"
conf.gembox "stdlib"
conf.gembox "stdlib-ext"
- conf.gembox "struct"
conf.enable_bintest
conf.enable_test
diff --git a/ruby_build_config.rb.lock b/ruby_build_config.rb.lock
index 0b289fd..329a3f9 100644
--- a/ruby_build_config.rb.lock
+++ b/ruby_build_config.rb.lock
@@ -1,4 +1,4 @@
---
mruby:
- version: 3.1.0
- release_no: 30100
+ version: 3.2.0
+ release_no: 30200
diff --git a/src/core.cpp b/src/core.cpp
index e40370e..d47127b 100644
--- a/src/core.cpp
+++ b/src/core.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2023 Frederico de Oliveira Linhares
+ * Copyright 2022-2024 Frederico de Oliveira Linhares
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -117,7 +117,7 @@ load_game(void *obj)
using namespace std::chrono;
FILE *fp;
- mrb_value main_obj = mrb_obj_iv_inspect(cg_core.mrb, cg_core.mrb->top_self);
+ mrb_value main_obj{mrb_top_self(cg_core.mrb)};
cg_core.game_name = "CandyGear Game";
diff --git a/src/main.cpp b/src/main.cpp
index 75b7894..945928d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright 2022 Frederico de Oliveira Linhares
+ * Copyright 2022-2024 Frederico de Oliveira Linhares
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@ int main(int argc, char *argv[])
return 1;
}
- mrb_value main_obj{mrb_obj_iv_inspect(cg_core.mrb, cg_core.mrb->top_self)};
+ mrb_value main_obj{mrb_top_self(cg_core.mrb)};
mrb_funcall_id(cg_core.mrb, main_obj, cg_core.sym_init, 0);
if (cg_core.mrb->exc)