zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gpu-dawn: use mach-glfw via package manager

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2023-07-07 21:17:10 -07:00
parent bf7511c175
commit 57adbef211
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libs/gpu-dawn/build.zig
View file

@ -4,7 +4,6 @@ const Build = std.Build;
pub fn build(b: *Build) !void { pub fn build(b: *Build) !void {
const optimize = b.standardOptimizeOption(.{}); const optimize = b.standardOptimizeOption(.{});
const target = b.standardTargetOptions(.{}); const target = b.standardTargetOptions(.{});
const glfw = @import("mach_glfw");
const options = Options{ const options = Options{
.install_libs = true, .install_libs = true,
.from_source = true, .from_source = true,
@ -19,8 +18,14 @@ pub fn build(b: *Build) !void {
.optimize = optimize, .optimize = optimize,
}); });
try link(b, example, options); try link(b, example, options);
try glfw.link(b, example, .{});
example.addModule("glfw", glfw.module(b)); 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); b.installArtifact(example);
} }

4
libs/gpu-dawn/build.zig.zon
View file

@ -3,8 +3,8 @@
.version = "0.2.0", .version = "0.2.0",
.dependencies = .{ .dependencies = .{
.mach_glfw = .{ .mach_glfw = .{
.url = "https://github.com/hexops/mach-glfw/archive/ddb1cf1cb712fd60fc7f8d14e8f84925e557562a.tar.gz", .url = "https://github.com/hexops/mach-glfw/archive/b119c63dd77764eeafe758d54accd0329821a729.tar.gz",
.hash = "122034c6b14f8c4ee65bc99efc673c4d71661ad8bb52a485da9b623ec6b8cd9ab8e9", .hash = "1220fb0fb65621a4fc7406e4f74a87a0c60208f8a257cd7ca4e20da0925f875e70d0",
}, },
.glfw = .{ .glfw = .{
.url = "https://github.com/hexops/glfw/archive/49c21c3d2fcaf9799b593f5320ce8e598a692c74.tar.gz", .url = "https://github.com/hexops/glfw/archive/49c21c3d2fcaf9799b593f5320ce8e598a692c74.tar.gz",