Skip to content

Commit

Permalink
remove false glfw dependency
Browse files Browse the repository at this point in the history
Signed-off-by: Stephen Gutekanst <[email protected]>
  • Loading branch information
slimsag committed Aug 13, 2023
1 parent 9f7fe79 commit 5aca0bf
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 27 deletions.
12 changes: 3 additions & 9 deletions build.zig
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ const Build = std.Build;
pub fn build(b: *Build) !void {
const optimize = b.standardOptimizeOption(.{});
const target = b.standardTargetOptions(.{});

// TODO: uncomment all this code once hexops/mach#902 is fixed, b.dependency("...") cannot
// be called inside `pub fn build` if we want this package to be usable via the package manager.
_ = optimize;
_ = target;

// TODO(build-system): Zig package manager currently can't handle transitive deps like this, so we need to use
// these explicitly here:
//
// const options = Options{
// .install_libs = true,
// .from_source = true,
Expand All @@ -23,12 +23,6 @@ pub fn build(b: *Build) !void {
// .optimize = optimize,
// });
// try link(b, example, options);
// const glfw_dep = b.dependency("mach_glfw", .{
// .target = example.target,
// .optimize = example.optimize,
// });
// example.linkLibrary(glfw_dep.artifact("mach-glfw"));
// example.addModule("mach-glfw", glfw_dep.module("mach-glfw"));
// b.installArtifact(example);
}

Expand Down
6 changes: 0 additions & 6 deletions build.zig.local
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@ pub fn build(b: *Build) !void {
.optimize = optimize,
});
try link(b, example, options);
const glfw_dep = b.dependency("mach_glfw", .{
.target = example.target,
.optimize = example.optimize,
});
example.linkLibrary(glfw_dep.artifact("mach-glfw"));
example.addModule("mach-glfw", glfw_dep.module("mach-glfw"));
b.installArtifact(example);
}

Expand Down
12 changes: 0 additions & 12 deletions build.zig.zon
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,6 @@
.url = "https://github.com/hexops/xcode-frameworks-pkg/archive/d486474a6af7fafd89e8314e0bf7eca4709f811b.tar.gz",
.hash = "1220293eae4bf67a7c27a18a8133621337cde91a97bc6859a9431b3b2d4217dfb5fb",
},
.mach_glfw = .{
.url = "https://pkg.machengine.org/mach-glfw/23f41c638585b571c86a7e7ae54410068aec4bd0.tar.gz",
.hash = "1220bcea77815a96c81c044641e358b076fb79646785a6170ad1e6b7109b0e6f2524",
},
.glfw = .{
.url = "https://pkg.machengine.org/glfw/b58903a759b8f8111a44eb18118e6440b6cc26b6.tar.gz",
.hash = "1220d62af03d3879f1a2b51ff5bcc8156a73b6312bceeba1069b0d66faf47418a992",
},
.direct3d_headers = .{
.url = "https://pkg.machengine.org/direct3d-headers/c02ba4ba3f9473560e41487090ee6bfbbc44c75b.tar.gz",
.hash = "1220b4a3be5bd4d0c4a206c909b07579070f4fa8c83dd82170ed1db846b0eea1ae9d",
Expand All @@ -22,10 +14,6 @@
.url = "https://pkg.machengine.org/vulkan-headers/0212dd8b71531d0cec8378ce8fb1721a0df7420a.tar.gz",
.hash = "1220a8b642edf8ef522e468cfe9a1803507472461b1041be717294ca484d1361afb0",
},
.wayland_headers = .{
.url = "https://pkg.machengine.org/wayland-headers/509275fb6222181a97026c884d411bd013da680b.tar.gz",
.hash = "12202cf6230788d948e5ee2afa26d4f6cc4994ae1bf0c1c832535b920717a1174223",
},
.x11_headers = .{
.url = "https://pkg.machengine.org/x11-headers/991ad9bf599df04aaa5332e536712a8476838ee3.tar.gz",
.hash = "12205bd95b9cc9cb08dd6b55f5842d8fae67a12eed01092c54f021060931815f711e",
Expand Down

0 comments on commit 5aca0bf

Please sign in to comment.