From 0dbba2fb9af4d8cbed511b0b9469a8cd8ef6eb57 Mon Sep 17 00:00:00 2001 From: Rekai Musuka Date: Sun, 19 Mar 2023 20:47:56 -0500 Subject: [PATCH] chore: update to 0.11.0-dev.2168+322ace70f --- README.md | 2 +- build.zig | 10 +++++----- lib/SDL.zig | 2 +- lib/zba-gdbstub | 2 +- lib/zgui | 2 +- lib/zig-clap | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index ba251da..2aa047e 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ arm7wrestler GBA Fixed | [destoer](https://github.com/destoer) ## Compiling -Most recently built on Zig [v0.11.0-dev.1580+a5b34a61a](https://github.com/ziglang/zig/tree/a5b34a61a) +Most recently built on Zig [v0.11.0-dev.2168+322ace70f](https://github.com/ziglang/zig/tree/322ace70f) ### Dependencies diff --git a/build.zig b/build.zig index 1eabf6d..dffd8aa 100644 --- a/build.zig +++ b/build.zig @@ -8,7 +8,7 @@ const nfd = @import("lib/nfd-zig/build.zig"); pub fn build(b: *std.build.Builder) void { // Minimum Zig Version - const min_ver = std.SemanticVersion.parse("0.11.0-dev.1580+a5b34a61a") catch return; // https://github.com/ziglang/zig/commit/a5b34a61a + const min_ver = std.SemanticVersion.parse("0.11.0-dev.2168+322ace70f") catch return; // https://github.com/ziglang/zig/commit/322ace70f if (builtin.zig_version.order(min_ver).compare(.lt)) { std.log.err("{s}", .{b.fmt("Zig v{} does not meet the minimum version requirement. (Zig v{})", .{ builtin.zig_version, min_ver })}); std.os.exit(1); @@ -48,7 +48,8 @@ pub fn build(b: *std.build.Builder) void { exe.addAnonymousModule("zba-util", .{ .source_file = .{ .path = "lib/zba-util/src/lib.zig" } }); // gdbstub - gdbstub.link(exe); + exe.addModule("gdbstub", gdbstub.getModule(b)); + // NativeFileDialog(ue) Bindings exe.linkLibrary(nfd.makeLib(b, target, optimize)); exe.addModule("nfd", nfd.getModule(b)); @@ -59,9 +60,8 @@ pub fn build(b: *std.build.Builder) void { exe.addModule("sdl2", sdk.getNativeModule()); // Dear ImGui bindings - const zgui_pkg = zgui.package(b, .{ .options = .{ .backend = .sdl2_opengl3 } }); - exe.addModule("zgui", zgui_pkg.module); - zgui.link(exe, zgui_pkg.options); + const zgui_pkg = zgui.package(b, target, optimize, .{ .options = .{ .backend = .sdl2_opengl3 } }); + zgui_pkg.link(exe); exe.install(); diff --git a/lib/SDL.zig b/lib/SDL.zig index aa063fa..cc3b023 160000 --- a/lib/SDL.zig +++ b/lib/SDL.zig @@ -1 +1 @@ -Subproject commit aa063fab4031d12213dd95f1db5bec9d4f6727bc +Subproject commit cc3b023f50e7b9ad690f1047a19a50feff4d1301 diff --git a/lib/zba-gdbstub b/lib/zba-gdbstub index acb5999..215e053 160000 --- a/lib/zba-gdbstub +++ b/lib/zba-gdbstub @@ -1 +1 @@ -Subproject commit acb59994fcfb83d36efef47810a9dc791c6e542e +Subproject commit 215e053b9ace6e6e561b64cb06e2516021f76897 diff --git a/lib/zgui b/lib/zgui index ceca3dd..1dfff5e 160000 --- a/lib/zgui +++ b/lib/zgui @@ -1 +1 @@ -Subproject commit ceca3dd6607f247d0d7ce12fbbd4623320277aac +Subproject commit 1dfff5e0b078b6ad60b58558f69cc92a0b9156e8 diff --git a/lib/zig-clap b/lib/zig-clap index cb13519..6310cbd 160000 --- a/lib/zig-clap +++ b/lib/zig-clap @@ -1 +1 @@ -Subproject commit cb13519431b916c05c6c783cb0ce3b232be5e400 +Subproject commit 6310cbd57684d62c4fb6ac73e0fa9883fab402c8