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

build: cleanup sysjs dependency utilization

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2024-04-20 06:43:02 -07:00 • committed by Stephen Gutekanst
parent a681a10170
commit e8b95d5076
1 changed files with 8 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

24
build.zig
View file

@ -70,6 +70,13 @@ pub fn build(b: *std.Build) !void {
}); });
module.addImport("build-options", build_options.createModule()); module.addImport("build-options", build_options.createModule());
if ((want_mach or want_core or want_sysaudio) and target.result.cpu.arch == .wasm32) {
if (b.lazyDependency("mach_sysjs", .{
.target = target,
.optimize = optimize,
})) |dep| module.addImport("mach-sysjs", dep.module("mach-sysjs"));
}
if (want_mach) { if (want_mach) {
// Linux gamemode requires libc. // Linux gamemode requires libc.
if (target.result.os.tag == .linux) module.link_libc = true; if (target.result.os.tag == .linux) module.link_libc = true;
@ -87,22 +94,12 @@ pub fn build(b: *std.Build) !void {
module.addImport("mach-harfbuzz", dep.module("mach-harfbuzz")); module.addImport("mach-harfbuzz", dep.module("mach-harfbuzz"));
} }
} }
if (b.lazyDependency("mach_sysjs", .{
.target = target,
.optimize = optimize,
})) |dep| module.addImport("mach-sysjs", dep.module("mach-sysjs"));
if (b.lazyDependency("font_assets", .{})) |dep| module.addImport("font-assets", dep.module("font-assets")); if (b.lazyDependency("font_assets", .{})) |dep| module.addImport("font-assets", dep.module("font-assets"));
try buildExamples(b, optimize, target, module); try buildExamples(b, optimize, target, module);
} }
if (want_core) { if (want_core) {
if (target.result.cpu.arch == .wasm32) { if (target.result.cpu.arch != .wasm32) {
if (b.lazyDependency("mach_sysjs", .{
.target = target,
.optimize = optimize,
})) |dep| module.addImport("mach-sysjs", dep.module("mach-sysjs"));
} else {
// TODO: for some reason this is not functional, a Zig bug (only when using this Zig package // TODO: for some reason this is not functional, a Zig bug (only when using this Zig package
// externally): // externally):
// //
@ -174,11 +171,6 @@ pub fn build(b: *std.Build) !void {
.target = target, .target = target,
.optimize = optimize, .optimize = optimize,
})) |dep| module.addImport("objc", dep.module("mach-objc")); })) |dep| module.addImport("objc", dep.module("mach-objc"));
} else {
if (b.lazyDependency("mach_sysjs", .{
.target = target,
.optimize = optimize,
})) |dep| module.addImport("sysjs", dep.module("mach-sysjs"));
} }
if (target.result.isDarwin()) { if (target.result.isDarwin()) {