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

pkg/fontconfig: make iconv build param non-windows specific

Browse Source
This commit is contained in:
Mitchell Hashimoto
2023-10-23 08:40:25 -07:00
parent f4a2273ad9
commit b9b33ab25d
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.zig
View File

@ -625,7 +625,6 @@ fn addDeps(
const fontconfig_dep = b.dependency("fontconfig", .{ const fontconfig_dep = b.dependency("fontconfig", .{
.target = step.target, .target = step.target,
.optimize = step.optimize, .optimize = step.optimize,
.@"enable-iconv-win" = false,
}); });
const freetype_dep = b.dependency("freetype", .{ const freetype_dep = b.dependency("freetype", .{
.target = step.target, .target = step.target,

8
pkg/fontconfig/build.zig
View File

@ -6,7 +6,11 @@ pub fn build(b: *std.Build) !void {
const optimize = b.standardOptimizeOption(.{}); const optimize = b.standardOptimizeOption(.{});
const libxml2_enabled = b.option(bool, "enable-libxml2", "Build libxml2") orelse true; const libxml2_enabled = b.option(bool, "enable-libxml2", "Build libxml2") orelse true;
const iconv_win_enabled = b.option(bool, "enable-iconv-win", "Build libxml2 with iconv on Windows") orelse false; const libxml2_iconv_enabled = b.option(
bool,
"enable-libxml2-iconv",
"Build libxml2 with iconv",
) orelse (target.getOsTag() != .windows);
const freetype_enabled = b.option(bool, "enable-freetype", "Build freetype") orelse true; const freetype_enabled = b.option(bool, "enable-freetype", "Build freetype") orelse true;
_ = b.addModule("fontconfig", .{ .source_file = .{ .path = "main.zig" } }); _ = b.addModule("fontconfig", .{ .source_file = .{ .path = "main.zig" } });
@ -29,7 +33,7 @@ pub fn build(b: *std.Build) !void {
const libxml2_dep = b.dependency("libxml2", .{ const libxml2_dep = b.dependency("libxml2", .{
.target = target, .target = target,
.optimize = optimize, .optimize = optimize,
.iconv = target.getOsTag() != .windows or iconv_win_enabled, .iconv = libxml2_iconv_enabled,
}); });
lib.linkLibrary(libxml2_dep.artifact("xml2")); lib.linkLibrary(libxml2_dep.artifact("xml2"));
} }