Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-15 00:06:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2530 from Nyaa97/main

Browse Source 
Fix linking freetype and glslang
This commit is contained in:
Mitchell Hashimoto
2024-10-30 16:51:47 -04:00
committed by GitHub
parent 7bf253043c 7eb5563e9c
commit c483c8c475
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.zig
View File

@ -975,7 +975,7 @@ fn addDeps(
if (b.systemIntegrationOption("freetype", .{})) { if (b.systemIntegrationOption("freetype", .{})) {
step.linkSystemLibrary2("bzip2", dynamic_link_opts); step.linkSystemLibrary2("bzip2", dynamic_link_opts);
step.linkSystemLibrary2("freetype", dynamic_link_opts); step.linkSystemLibrary2("freetype2", dynamic_link_opts);
} else { } else {
step.linkLibrary(freetype_dep.artifact("freetype")); step.linkLibrary(freetype_dep.artifact("freetype"));
try static_libs.append(freetype_dep.artifact("freetype").getEmittedBin()); try static_libs.append(freetype_dep.artifact("freetype").getEmittedBin());
@ -1068,6 +1068,7 @@ fn addDeps(
step.root_module.addImport("glslang", glslang_dep.module("glslang")); step.root_module.addImport("glslang", glslang_dep.module("glslang"));
if (b.systemIntegrationOption("glslang", .{})) { if (b.systemIntegrationOption("glslang", .{})) {
step.linkSystemLibrary2("glslang", dynamic_link_opts); step.linkSystemLibrary2("glslang", dynamic_link_opts);
step.linkSystemLibrary2("glslang-default-resource-limits", dynamic_link_opts);
} else { } else {
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());

2
pkg/cimgui/build.zig
View File

@ -32,7 +32,7 @@ pub fn build(b: *std.Build) !void {
}; };
if (b.systemIntegrationOption("freetype", .{})) { if (b.systemIntegrationOption("freetype", .{})) {
lib.linkSystemLibrary2("freetype", dynamic_link_opts); lib.linkSystemLibrary2("freetype2", dynamic_link_opts);
} else { } else {
const freetype = b.dependency("freetype", .{ const freetype = b.dependency("freetype", .{
.target = target, .target = target,

3
pkg/harfbuzz/build.zig
View File

@ -76,7 +76,8 @@ pub fn build(b: *std.Build) !void {
}); });
if (b.systemIntegrationOption("freetype", .{})) { if (b.systemIntegrationOption("freetype", .{})) {
lib.linkSystemLibrary2("freetype", dynamic_link_opts); lib.linkSystemLibrary2("freetype2", dynamic_link_opts);
module.linkSystemLibrary("freetype2", dynamic_link_opts);
} else { } else {
lib.linkLibrary(freetype.artifact("freetype")); lib.linkLibrary(freetype.artifact("freetype"));
module.addIncludePath(freetype.builder.dependency("freetype", .{}).path("include")); module.addIncludePath(freetype.builder.dependency("freetype", .{}).path("include"));