Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-08-02 14:57:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

wasm: build.zig uses addDeps for wasm

Browse Source
This commit is contained in:
Mitchell Hashimoto
2022-12-07 18:39:46 -08:00
parent f53d9fb704
commit 2c5b5429e3
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
build.zig
View File

@ -124,10 +124,7 @@ pub fn build(b: *std.build.Builder) !void {
wasm.addOptions("build_options", exe_options);
// Wasm-specific deps
wasm.addPackage(js.pkg);
wasm.addPackage(tracylib.pkg);
wasm.addPackage(utf8proc.pkg);
_ = try utf8proc.link(b, wasm);
try addDeps(b, wasm, true);
const step = b.step("wasm", "Build the wasm library");
step.dependOn(&wasm.step);
@ -139,7 +136,7 @@ pub fn build(b: *std.build.Builder) !void {
const main_test = b.addTest("src/main_wasm.zig");
main_test.setTarget(.{ .cpu_arch = .wasm32, .os_tag = .wasi });
main_test.addOptions("build_options", exe_options);
main_test.addPackage(js.pkg);
try addDeps(b, main_test, true);
test_step.dependOn(&main_test.step);
}
@ -222,6 +219,20 @@ fn addDeps(
step: *std.build.LibExeObjStep,
static: bool,
) !void {
// Wasm we do manually since it is such a different build.
if (step.target.getCpuArch() == .wasm32) {
// We link this package but its a no-op since Tracy
// never actualy WORKS with wasm.
step.addPackage(tracylib.pkg);
step.addPackage(utf8proc.pkg);
step.addPackage(js.pkg);
// utf8proc
_ = try utf8proc.link(b, step);
return;
}
// We always need the Zig packages
if (enable_fontconfig) step.addPackage(fontconfig.pkg);
step.addPackage(freetype.pkg);
@ -240,11 +251,6 @@ fn addDeps(
_ = try macos.link(b, step, .{});
}
// Wasm
if (step.target.getCpuArch() == .wasm32) {
step.addPackage(js.pkg);
}
// We always statically compile glad
step.addIncludePath("vendor/glad/include/");
step.addCSourceFile("vendor/glad/src/gl.c", &.{});