aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Weissflog <floooh@gmail.com>2024-02-20 19:27:04 +0100
committerAndre Weissflog <floooh@gmail.com>2024-02-20 19:27:04 +0100
commitb728ee66d1d8a83247bdde75aacb299aee294475 (patch)
treede4bfaffcd3603781e18d1a1620b1bd362ec6d6b
parentcc138af79196089f393d096dd6d627fa891569e1 (diff)
rust bindgen fixes, add sokol_imgui.h to rust generation
-rw-r--r--bindgen/gen_all.py8
-rw-r--r--bindgen/gen_rust.py8
2 files changed, 9 insertions, 7 deletions
diff --git a/bindgen/gen_all.py b/bindgen/gen_all.py
index 482a0a00..46962298 100644
--- a/bindgen/gen_all.py
+++ b/bindgen/gen_all.py
@@ -4,7 +4,7 @@ tasks = [
[ '../sokol_log.h', 'slog_', [] ],
[ '../sokol_gfx.h', 'sg_', [] ],
[ '../sokol_app.h', 'sapp_', [] ],
- [ '../sokol_glue.h', 'sglue_', ['sg_'] ],
+ [ '../sokol_glue.h', 'sglue_', ['sg_'] ],
[ '../sokol_time.h', 'stm_', [] ],
[ '../sokol_audio.h', 'saudio_', [] ],
[ '../util/sokol_gl.h', 'sgl_', ['sg_'] ],
@@ -31,7 +31,11 @@ for task in tasks:
gen_zig.gen(c_header_path, main_prefix, dep_prefixes)
# Rust
+rust_tasks = [
+ *tasks,
+ [ '../util/sokol_imgui.h', 'simgui_', ['sg_', 'sapp_'] ],
+]
gen_rust.prepare()
-for task in tasks:
+for task in rust_tasks:
[c_header_path, main_prefix, dep_prefixes] = task
gen_rust.gen(c_header_path, main_prefix, dep_prefixes)
diff --git a/bindgen/gen_rust.py b/bindgen/gen_rust.py
index af83789b..0984d14a 100644
--- a/bindgen/gen_rust.py
+++ b/bindgen/gen_rust.py
@@ -19,14 +19,12 @@ module_names = {
"sgl_": "gl",
"sdtx_": "debugtext",
"sshape_": "shape",
- "sapp_sg": "glue",
"simgui_": "imgui",
- "sg_imgui_": "gfx_imgui",
+ "sglue_": "glue",
}
module_requires_rust_feature = {
module_names["simgui_"]: "imgui",
- module_names["sg_imgui_"]: "imgui",
}
c_source_paths = {
@@ -38,14 +36,14 @@ c_source_paths = {
"sgl_": "sokol-rust/src/sokol/c/sokol_gl.c",
"sdtx_": "sokol-rust/src/sokol/c/sokol_debugtext.c",
"sshape_": "sokol-rust/src/sokol/c/sokol_shape.c",
- "sapp_sg": "sokol-rust/src/sokol/c/sokol_glue.c",
"simgui_": "sokol-rust/src/sokol/c/sokol_imgui.c",
- "sg_imgui_": "sokol-rust/src/sokol/c/sokol_gfx_imgui.c",
+ "sglue_": "sokol-rust/src/sokol/c/sokol_glue.c",
}
ignores = [
"sdtx_printf",
"sdtx_vprintf",
+ "simgui_add_key_event",
# "sg_install_trace_hooks",
# "sg_trace_hooks",
]