Revert "build glfw"

This reverts commit f0e7be542b.
This commit is contained in:
David Allemang
2024-07-03 11:34:16 -04:00
parent f0e7be542b
commit d6fb485601
6 changed files with 71 additions and 115 deletions

View File

@@ -1,6 +1,5 @@
const std = @import("std");
const vkgen = @import("vulkan-zig");
const glfw_util = @import("glfw");
pub fn build(b: *std.Build) !void {
const target = b.standardTargetOptions(.{});
@@ -8,7 +7,6 @@ pub fn build(b: *std.Build) !void {
const imgui_dep = b.dependency("imgui", .{});
const cimgui_dep = b.dependency("cimgui", .{});
const glfw_dep = b.dependency("glfw", .{});
const luajit = try b.findProgram(&.{"luajit"}, &.{});
@@ -76,7 +74,13 @@ 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");
glfw_util.link(glfw_dep, cimgui);
// todo separate impls into different shared libraries for easier linkage
cimgui.linkSystemLibrary2("glfw3", .{
.needed = true,
.preferred_link_mode = .static,
.use_pkg_config = .force,
});
b.installArtifact(cimgui);

View File

@@ -11,9 +11,6 @@
.url = "https://github.com/ocornut/imgui/archive/refs/tags/v1.90.8-docking.tar.gz",
.hash = "122065151b97161e25abb71c9df2fd9fba42aaca8c33d689a480b883d82411c8fabe",
},
.glfw = .{
.path = "../glfw",
}
},
.paths = .{