diff --git a/build.zig b/build.zig index 911ea8c05..e6e95b0fe 100644 --- a/build.zig +++ b/build.zig @@ -621,6 +621,7 @@ fn addDeps( }; // Dependencies + const cimgui_dep = b.dependency("cimgui", .{ .target = step.target, .optimize = step.optimize }); const js_dep = b.dependency("zig_js", .{ .target = step.target, .optimize = step.optimize }); const libxev_dep = b.dependency("libxev", .{ .target = step.target, .optimize = step.optimize }); const objc_dep = b.dependency("zig_objc", .{ .target = step.target, .optimize = step.optimize }); @@ -724,6 +725,11 @@ fn addDeps( try static_libs.append(macos_dep.artifact("macos").getEmittedBin()); } + // cimgui + step.addModule("cimgui", cimgui_dep.module("cimgui")); + step.linkLibrary(cimgui_dep.artifact("cimgui")); + try static_libs.append(cimgui_dep.artifact("cimgui").getEmittedBin()); + // Tracy step.addModule("tracy", tracy_dep.module("tracy")); if (tracy) { diff --git a/build.zig.zon b/build.zig.zon index e2d8d0fb2..bfca4e766 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -27,6 +27,7 @@ }, // C libs + .cimgui = .{ .path = "./pkg/cimgui" }, .fontconfig = .{ .path = "./pkg/fontconfig" }, .freetype = .{ .path = "./pkg/freetype" }, .harfbuzz = .{ .path = "./pkg/harfbuzz" }, diff --git a/pkg/cimgui/build.zig b/pkg/cimgui/build.zig index def42d5b7..fcd6918e4 100644 --- a/pkg/cimgui/build.zig +++ b/pkg/cimgui/build.zig @@ -5,7 +5,7 @@ pub fn build(b: *std.Build) !void { const target = b.standardTargetOptions(.{}); const optimize = b.standardOptimizeOption(.{}); - _ = b.addModule("imgui", .{ .source_file = .{ .path = "main.zig" } }); + _ = b.addModule("cimgui", .{ .source_file = .{ .path = "main.zig" } }); const imgui = b.dependency("imgui", .{}); const lib = b.addStaticLibrary(.{ diff --git a/pkg/cimgui/c.zig b/pkg/cimgui/c.zig new file mode 100644 index 000000000..f644a084b --- /dev/null +++ b/pkg/cimgui/c.zig @@ -0,0 +1,3 @@ +pub usingnamespace @cImport({ + @cInclude("cimgui.h"); +}); diff --git a/pkg/cimgui/main.zig b/pkg/cimgui/main.zig index 624ce9aa4..22183a367 100644 --- a/pkg/cimgui/main.zig +++ b/pkg/cimgui/main.zig @@ -1 +1,3 @@ +pub const c = @import("c.zig"); + test {}