From 1c54bdb1ad493c0348b50111b8c4bdd81e224041 Mon Sep 17 00:00:00 2001 From: David Allemang Date: Wed, 3 Jul 2024 13:13:19 -0400 Subject: [PATCH] static link --- build.zig | 2 -- cimgui/build.zig | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/build.zig b/build.zig index c6d8fbb..27f0961 100644 --- a/build.zig +++ b/build.zig @@ -30,8 +30,6 @@ pub fn build(b: *std.Build) void { shaders.add("triangle_frag", "src/shaders/triangle.frag", .{}); exe.root_module.addImport("shaders", shaders.getModule()); - // this requires PKG_CONFIG_PATH to be set. something like: - // ~/.local/lib/pkgconfig/ exe.linkSystemLibrary2("glfw3", .{ .needed = true, .preferred_link_mode = .static, diff --git a/cimgui/build.zig b/cimgui/build.zig index 11349b1..60d88df 100644 --- a/cimgui/build.zig +++ b/cimgui/build.zig @@ -43,7 +43,7 @@ pub fn build(b: *std.Build) !void { _ = copy.addCopyFile(cimgui_dep.path("cimgui.cpp"), "cimgui.cpp"); _ = copy.addCopyFile(cimgui_dep.path("generator/output/cimgui_impl.h"), "cimgui_impl.h"); - const cimgui = b.addSharedLibrary(.{ + const cimgui = b.addStaticLibrary(.{ .name = "cimgui", .target = target, .optimize = optimize, @@ -75,7 +75,6 @@ pub fn build(b: *std.Build) !void { cimgui.installHeader(copy.getDirectory().path(b, "cimgui.h"), "cimgui.h"); cimgui.installHeader(copy.getDirectory().path(b, "cimgui_impl.h"), "cimgui_impl.h"); - // todo separate impls into different shared libraries for easier linkage cimgui.linkSystemLibrary2("glfw3", .{ .needed = true, .preferred_link_mode = .static,