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

mach: build: simplify stating of dependencies for apps

Browse source
This commit is contained in:
iddev5 2022-05-26 13:16:32 +05:30 • committed by Stephen Gutekanst
parent a1f756b4cd
commit 1c2dbfbd4f
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
build.zig
View file

@ -54,7 +54,7 @@ pub fn build(b: *std.build.Builder) void {
.name = "example-" ++ example.name, .name = "example-" ++ example.name,
.src = "examples/" ++ example.name ++ "/main.zig", .src = "examples/" ++ example.name ++ "/main.zig",
.target = target, .target = target,
.deps = comptime example.packages ++ &[_]Pkg{ glfw.pkg, gpu.pkg, pkg }, .deps = example.packages,
}, },
); );
example_app.setBuildMode(mode); example_app.setBuildMode(mode);
@ -79,7 +79,6 @@ pub fn build(b: *std.build.Builder) void {
.name = "shaderexp", .name = "shaderexp",
.src = "shaderexp/main.zig", .src = "shaderexp/main.zig",
.target = target, .target = target,
.deps = &.{ glfw.pkg, gpu.pkg, pkg },
}, },
); );
shaderexp_app.setBuildMode(mode); shaderexp_app.setBuildMode(mode);
@ -133,10 +132,16 @@ pub const App = struct {
target: std.zig.CrossTarget, target: std.zig.CrossTarget,
deps: ?[]const Pkg = null, deps: ?[]const Pkg = null,
}) App { }) App {
const mach_deps: []const Pkg = &.{ glfw.pkg, gpu.pkg, pkg };
const deps = if (options.deps) |app_deps|
std.mem.concat(b.allocator, Pkg, &.{ mach_deps, app_deps }) catch unreachable
else
mach_deps;
const app_pkg = std.build.Pkg{ const app_pkg = std.build.Pkg{
.name = "app", .name = "app",
.path = .{ .path = options.src }, .path = .{ .path = options.src },
.dependencies = options.deps, .dependencies = deps,
}; };
const step = blk: { const step = blk: {
@ -200,7 +205,7 @@ pub const App = struct {
pub const pkg = std.build.Pkg{ pub const pkg = std.build.Pkg{
.name = "mach", .name = "mach",
.path = .{ .path = thisDir() ++ "/src/main.zig" }, .path = .{ .path = thisDir() ++ "/src/main.zig" },
.dependencies = &.{ gpu.pkg, glfw.pkg }, .dependencies = &.{gpu.pkg},
}; };
fn thisDir() []const u8 { fn thisDir() []const u8 {