From 21faf0b6fb4b536ea7c8a35e04b2d66784c47a55 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sat, 3 Dec 2022 21:46:00 -0800 Subject: [PATCH] add zig-js --- .gitmodules | 3 +++ build.zig | 6 ++++++ vendor/zig-js | 1 + 3 files changed, 10 insertions(+) create mode 160000 vendor/zig-js diff --git a/.gitmodules b/.gitmodules index 7250a6c86..4b66a803a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,3 +34,6 @@ [submodule "vendor/pixman"] path = vendor/pixman url = https://github.com/freedesktop/pixman.git +[submodule "vendor/zig-js"] + path = vendor/zig-js + url = https://github.com/mitchellh/zig-js.git diff --git a/build.zig b/build.zig index 7232f1d88..207acfa06 100644 --- a/build.zig +++ b/build.zig @@ -7,6 +7,7 @@ const fontconfig = @import("pkg/fontconfig/build.zig"); const freetype = @import("pkg/freetype/build.zig"); const harfbuzz = @import("pkg/harfbuzz/build.zig"); const imgui = @import("pkg/imgui/build.zig"); +const js = @import("vendor/zig-js/build.zig"); const libxml2 = @import("vendor/zig-libxml2/libxml2.zig"); const libuv = @import("pkg/libuv/build.zig"); const libpng = @import("pkg/libpng/build.zig"); @@ -235,6 +236,11 @@ 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", &.{}); diff --git a/vendor/zig-js b/vendor/zig-js new file mode 160000 index 000000000..a6d0b5a0c --- /dev/null +++ b/vendor/zig-js @@ -0,0 +1 @@ +Subproject commit a6d0b5a0c421925409f1bce542f64b9e5f6b96df