Compare commits

..
7 Commits
Author SHA1 Message Date
syedm 8a3da07c6c Cleanup 2026-07-26 19:59:14 +01:00
syedm e188501d19 Setup python env 2026-07-26 19:59:10 +01:00
syedm e0994b42c0 Add some useful mgems 2026-07-26 19:49:39 +01:00
syedm d484db4e84 Format files (using clang-format) 2026-07-26 19:17:24 +01:00
syedm f82ab718f3 Make fread call error handle 2026-07-26 19:12:32 +01:00
syedm 2f70c44ad5 Fix incorrect comparision 2026-07-26 19:10:53 +01:00
syedm 2006ee55ab Remove clang specific warning 2026-07-26 19:08:56 +01:00
28 changed files with 76 additions and 25 deletions
+9
View File
@@ -2,3 +2,12 @@
path = libs/mruby path = libs/mruby
url = https://github.com/mruby/mruby.git url = https://github.com/mruby/mruby.git
ignore = dirty ignore = dirty
[submodule "libs/mgems/mruby-process"]
path = libs/mgems/mruby-process
url = https://github.com/katzer/mruby-process
[submodule "libs/mgems/mruby-env"]
path = libs/mgems/mruby-env
url = https://github.com/iij/mruby-env.git
[submodule "libs/mgems/mruby-marshal-c"]
path = libs/mgems/mruby-marshal-c
url = https://github.com/LanzaSchneider/mruby-marshal-c.git
-2
View File
@@ -29,14 +29,12 @@ MRUBY_LIBS := $(MRUBY_LIB)
CFLAGS_DEBUG := \ CFLAGS_DEBUG := \
-std=c++20 -Wall -Wextra \ -std=c++20 -Wall -Wextra \
-Og -g -fno-omit-frame-pointer \ -Og -g -fno-omit-frame-pointer \
-Wno-unused-command-line-argument \
-I./include -I./libs/mruby/build/host/include \ -I./include -I./libs/mruby/build/host/include \
$(SDL_CFLAGS) $(MRUBY_CFLAGS) $(SDL_CFLAGS) $(MRUBY_CFLAGS)
CFLAGS_RELEASE := \ CFLAGS_RELEASE := \
-std=c++20 -O3 -mtune=generic \ -std=c++20 -O3 -mtune=generic \
-fno-rtti -fomit-frame-pointer -DNDEBUG -s \ -fno-rtti -fomit-frame-pointer -DNDEBUG -s \
-Wno-unused-command-line-argument \
-I./include -I./libs/mruby/build/host/include \ -I./include -I./libs/mruby/build/host/include \
$(SDL_CFLAGS) $(MRUBY_CFLAGS) $(SDL_CFLAGS) $(MRUBY_CFLAGS)
+11
View File
@@ -81,12 +81,20 @@
''; '';
}; };
pythonEnv = pkgs.python3.withPackages (
ps: with ps; [
pandas
matplotlib
]
);
in in
{ {
packages.${system} = { packages.${system} = {
default = misth; default = misth;
misth = misth; misth = misth;
mruby = mruby; mruby = mruby;
pythonEnv = pythonEnv;
}; };
devShells.${system}.default = pkgs.mkShell { devShells.${system}.default = pkgs.mkShell {
@@ -104,6 +112,9 @@
sdl3 sdl3
sdl3-ttf sdl3-ttf
sdl3-image sdl3-image
pythonEnv
ruff
]; ];
shellHook = '' shellHook = ''
+1 -2
View File
@@ -226,8 +226,7 @@ struct Pool {
bool is_valid(uint64_t index) const { bool is_valid(uint64_t index) const {
uint32_t id = (uint32_t)(index & 0xFFFFFFFFULL); uint32_t id = (uint32_t)(index & 0xFFFFFFFFULL);
uint32_t gen = (uint32_t)(index >> 32); uint32_t gen = (uint32_t)(index >> 32);
return id >= 0 return id < slots.size()
&& id < slots.size()
&& slots[id].alive && slots[id].alive
&& slots[id].generation == gen; && slots[id].generation == gen;
} }
+23
View File
@@ -20,6 +20,17 @@
# Use mrbgems # Use mrbgems
# conf.gem 'examples/mrbgems/ruby_extension_example' # conf.gem 'examples/mrbgems/ruby_extension_example'
@@ -16,6 +28,10 @@
# include the GEM box
conf.gembox 'default'
+ conf.gem '../mgems/mruby-env'
+ conf.gem '../mgems/mruby-process'
+ conf.gem '../mgems/mruby-marshal-c'
+
# C compiler settings
# conf.cc do |cc|
# cc.command = ENV['CC'] || 'gcc'
@@ -79,5 +79,5 @@ @@ -79,5 +79,5 @@
# Turn on `enable_debug` for better debugging # Turn on `enable_debug` for better debugging
# conf.enable_debug # conf.enable_debug
@@ -28,3 +39,15 @@
+ # conf.enable_bintest + # conf.enable_bintest
+ # conf.enable_test + # conf.enable_test
end end
--- ./mgems/mruby-process/mrbgem.rake
+++ ./mgems/mruby-process/mrbgem.rake
@@ -54,4 +54,9 @@
else
spec.objs.delete objfile("#{build_dir}/src/win32")
end
+
+ spec.objs.delete objfile("#{build_dir}/src/internal")
+ spec.objs.delete objfile("#{build_dir}/src/dln")
+ spec.objs.delete objfile("#{build_dir}/src/signal")
+ spec.objs.delete objfile("#{build_dir}/src/status")
end
+1 -1
View File
@@ -19,7 +19,7 @@ bg_image1_a = Animation.from(bg_image1)
App.language = :en App.language = :en
App.localize(:en, :btn_text, "Click %{name}!") App.localize(:en, :btn_text, "Click %{name}!")
text = ElementText.new :btn_text, default_font, 0xFFFF00, {name: "Me"}, position: {x: 50, y: 50}, z: 1, click_mode: :block, alpha: 1 text = ElementText.new :btn_text, default_font, 0xFFFF00, {name: ENV.fetch("name", "me")}, position: {x: 50, y: 50}, z: 1, click_mode: :block, alpha: 1
rect = ElementRect.new 100, 25, 0xFF0000, position: {x: 50, y: 50}, z: 0, rotation: 60, scale: { x: 1, y: 1 }, alpha: 0.8, click_mode: :block rect = ElementRect.new 100, 25, 0xFF0000, position: {x: 50, y: 50}, z: 0, rotation: 60, scale: { x: 1, y: 1 }, alpha: 0.8, click_mode: :block
+9 -1
View File
@@ -15,7 +15,15 @@ int main(int argc, char *argv[]) {
fseek(file, 0, SEEK_SET); fseek(file, 0, SEEK_SET);
char *script_content = (char *)malloc(size + 1); char *script_content = (char *)malloc(size + 1);
fread(script_content, 1, size, file); size_t read = fread(script_content, 1, size, file);
if (read != size) {
fprintf(stderr, "Failed to read startup script: %s\n", startup_script);
free(script_content);
fclose(file);
return 1;
}
script_content[size] = '\0'; script_content[size] = '\0';
fclose(file); fclose(file);