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

gpu: add std.build.Pkg definition

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2022-04-04 22:40:28 -07:00 • committed by Stephen Gutekanst
parent 0161ccef37
commit 451b437322
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
gpu/build.zig
View file

@ -14,12 +14,12 @@ pub fn build(b: *std.build.Builder) void {
lib.setTarget(target); lib.setTarget(target);
lib.setBuildMode(mode); lib.setBuildMode(mode);
lib.install(); lib.install();
link(b, lib, .{.gpu_dawn_options = gpu_dawn_options}); link(b, lib, .{ .gpu_dawn_options = gpu_dawn_options });
const main_tests = b.addTest("src/main.zig"); const main_tests = b.addTest("src/main.zig");
main_tests.setTarget(target); main_tests.setTarget(target);
main_tests.setBuildMode(mode); main_tests.setBuildMode(mode);
link(b, main_tests, .{.gpu_dawn_options = gpu_dawn_options}); link(b, main_tests, .{ .gpu_dawn_options = gpu_dawn_options });
const test_step = b.step("test", "Run library tests"); const test_step = b.step("test", "Run library tests");
test_step.dependOn(&main_tests.step); test_step.dependOn(&main_tests.step);
@ -31,7 +31,7 @@ pub fn build(b: *std.build.Builder) void {
example.linkLibC(); example.linkLibC();
example.addPackagePath("gpu", "src/main.zig"); example.addPackagePath("gpu", "src/main.zig");
example.addPackagePath("glfw", "libs/mach-glfw/src/main.zig"); example.addPackagePath("glfw", "libs/mach-glfw/src/main.zig");
link(b, example, .{.gpu_dawn_options = gpu_dawn_options}); link(b, example, .{ .gpu_dawn_options = gpu_dawn_options });
const example_run_cmd = example.run(); const example_run_cmd = example.run();
example_run_cmd.step.dependOn(b.getInstallStep()); example_run_cmd.step.dependOn(b.getInstallStep());
@ -44,6 +44,12 @@ const Options = struct {
gpu_dawn_options: gpu_dawn.Options = .{}, gpu_dawn_options: gpu_dawn.Options = .{},
}; };
pub const pkg = .{
.name = "gpu",
.path = .{ .path = thisDir() ++ "/src/main.zig" },
.dependencies = &.{glfw.pkg},
};
pub fn link(b: *std.build.Builder, step: *std.build.LibExeObjStep, options: Options) void { pub fn link(b: *std.build.Builder, step: *std.build.LibExeObjStep, options: Options) void {
const main_abs = std.fs.path.join(b.allocator, &.{ thisDir(), "src/main.zig" }) catch unreachable; const main_abs = std.fs.path.join(b.allocator, &.{ thisDir(), "src/main.zig" }) catch unreachable;
const lib = b.addStaticLibrary("gpu", main_abs); const lib = b.addStaticLibrary("gpu", main_abs);
@ -57,7 +63,6 @@ pub fn link(b: *std.build.Builder, step: *std.build.LibExeObjStep, options: Opti
gpu_dawn.link(b, lib, options.gpu_dawn_options); gpu_dawn.link(b, lib, options.gpu_dawn_options);
lib.install(); lib.install();
step.linkLibrary(lib);
glfw.link(b, step, options.glfw_options); glfw.link(b, step, options.glfw_options);
gpu_dawn.link(b, step, options.gpu_dawn_options); gpu_dawn.link(b, step, options.gpu_dawn_options);
} }