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

build: add spirv-cross

Browse Source
This commit is contained in:
Mitchell Hashimoto
2023-11-15 22:41:12 -08:00
parent 7821e6aa3a
commit 291ca16c20
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build.zig
View File

@ -647,6 +647,10 @@ fn addDeps(
.target = step.target, .target = step.target,
.optimize = step.optimize, .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", .{ const mach_glfw_dep = b.dependency("mach_glfw", .{
.target = step.target, .target = step.target,
.optimize = step.optimize, .optimize = step.optimize,
@ -723,6 +727,7 @@ fn addDeps(
); );
step.addModule("freetype", freetype_dep.module("freetype")); step.addModule("freetype", freetype_dep.module("freetype"));
step.addModule("glslang", glslang_dep.module("glslang")); 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("harfbuzz", harfbuzz_dep.module("harfbuzz"));
step.addModule("xev", libxev_dep.module("xev")); step.addModule("xev", libxev_dep.module("xev"));
step.addModule("pixman", pixman_dep.module("pixman")); step.addModule("pixman", pixman_dep.module("pixman"));
@ -752,6 +757,10 @@ fn addDeps(
step.linkLibrary(glslang_dep.artifact("glslang")); step.linkLibrary(glslang_dep.artifact("glslang"));
try static_libs.append(glslang_dep.artifact("glslang").getEmittedBin()); 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 // Dynamic link
if (!static) { if (!static) {
step.addIncludePath(freetype_dep.path("")); step.addIncludePath(freetype_dep.path(""));

5
build.zig.zon
View File

@ -29,7 +29,6 @@
.cimgui = .{ .path = "./pkg/cimgui" }, .cimgui = .{ .path = "./pkg/cimgui" },
.fontconfig = .{ .path = "./pkg/fontconfig" }, .fontconfig = .{ .path = "./pkg/fontconfig" },
.freetype = .{ .path = "./pkg/freetype" }, .freetype = .{ .path = "./pkg/freetype" },
.glslang = .{ .path = "./pkg/glslang" },
.harfbuzz = .{ .path = "./pkg/harfbuzz" }, .harfbuzz = .{ .path = "./pkg/harfbuzz" },
.libpng = .{ .path = "./pkg/libpng" }, .libpng = .{ .path = "./pkg/libpng" },
.macos = .{ .path = "./pkg/macos" }, .macos = .{ .path = "./pkg/macos" },
@ -37,6 +36,10 @@
.tracy = .{ .path = "./pkg/tracy" }, .tracy = .{ .path = "./pkg/tracy" },
.zlib = .{ .path = "./pkg/zlib" }, .zlib = .{ .path = "./pkg/zlib" },
// Shader translation
.glslang = .{ .path = "./pkg/glslang" },
.spirv_cross = .{ .path = "./pkg/spirv-cross" },
// System headers // System headers
.apple_sdk = .{ .path = "./pkg/apple-sdk" }, .apple_sdk = .{ .path = "./pkg/apple-sdk" },
}, },