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

gpu: make -Ddawn-from-source=true work in gpu/ example

Browse source 
Previously this was only working in the gpu-dawn/ example.

Fixes hexops/mach#196

Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2022-03-31 16:44:33 +00:00
parent 263b9708fd
commit 13de9d6a8c
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gpu/build.zig
View file

@ -6,18 +6,22 @@ pub fn build(b: *std.build.Builder) void {
const mode = b.standardReleaseOptions();
const target = b.standardTargetOptions(.{});
const gpu_dawn_options = gpu_dawn.Options{
.from_source = b.option(bool, "dawn-from-source", "Build Dawn from source") orelse false,
};
const lib = b.addStaticLibrary("gpu", "src/main.zig");
lib.setTarget(target);
lib.setBuildMode(mode);
lib.install();
glfw.link(b, lib, .{});
gpu_dawn.link(b, lib, .{});
gpu_dawn.link(b, lib, gpu_dawn_options);
const main_tests = b.addTest("src/main.zig");
main_tests.setTarget(target);
main_tests.setBuildMode(mode);
glfw.link(b, main_tests, .{});
gpu_dawn.link(b, main_tests, .{});
gpu_dawn.link(b, main_tests, gpu_dawn_options);
const test_step = b.step("test", "Run library tests");
test_step.dependOn(&main_tests.step);
@ -30,7 +34,7 @@ pub fn build(b: *std.build.Builder) void {
example.addPackagePath("gpu", "src/main.zig");
example.addPackagePath("glfw", "libs/mach-glfw/src/main.zig");
glfw.link(b, example, .{});
gpu_dawn.link(b, example, .{});
gpu_dawn.link(b, example, gpu_dawn_options);
const example_run_cmd = example.run();
example_run_cmd.step.dependOn(b.getInstallStep());