diff --git a/build.zig b/build.zig index df093ac8a..6146f93f5 100644 --- a/build.zig +++ b/build.zig @@ -647,6 +647,10 @@ fn addDeps( .target = step.target, .optimize = step.optimize, }); + const spirv_cross_dep = b.dependency("spirv_cross", .{ + .target = step.target, + .optimize = step.optimize, + }); const mach_glfw_dep = b.dependency("mach_glfw", .{ .target = step.target, .optimize = step.optimize, @@ -723,6 +727,7 @@ fn addDeps( ); step.addModule("freetype", freetype_dep.module("freetype")); step.addModule("glslang", glslang_dep.module("glslang")); + step.addModule("spirv_cross", spirv_cross_dep.module("spirv_cross")); step.addModule("harfbuzz", harfbuzz_dep.module("harfbuzz")); step.addModule("xev", libxev_dep.module("xev")); step.addModule("pixman", pixman_dep.module("pixman")); @@ -752,6 +757,10 @@ fn addDeps( step.linkLibrary(glslang_dep.artifact("glslang")); try static_libs.append(glslang_dep.artifact("glslang").getEmittedBin()); + // Spirv-Cross + step.linkLibrary(spirv_cross_dep.artifact("spirv_cross")); + try static_libs.append(spirv_cross_dep.artifact("spirv_cross").getEmittedBin()); + // Dynamic link if (!static) { step.addIncludePath(freetype_dep.path("")); diff --git a/build.zig.zon b/build.zig.zon index 198743c45..580c8593e 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -29,7 +29,6 @@ .cimgui = .{ .path = "./pkg/cimgui" }, .fontconfig = .{ .path = "./pkg/fontconfig" }, .freetype = .{ .path = "./pkg/freetype" }, - .glslang = .{ .path = "./pkg/glslang" }, .harfbuzz = .{ .path = "./pkg/harfbuzz" }, .libpng = .{ .path = "./pkg/libpng" }, .macos = .{ .path = "./pkg/macos" }, @@ -37,6 +36,10 @@ .tracy = .{ .path = "./pkg/tracy" }, .zlib = .{ .path = "./pkg/zlib" }, + // Shader translation + .glslang = .{ .path = "./pkg/glslang" }, + .spirv_cross = .{ .path = "./pkg/spirv-cross" }, + // System headers .apple_sdk = .{ .path = "./pkg/apple-sdk" }, },