Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-04-20 00:18:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

no more system_sdk

Browse Source
This commit is contained in:
Mitchell Hashimoto
2023-10-01 17:38:30 -07:00
parent 3a4842a0a5
commit d71197dc59
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.zig
View File

@ -14,8 +14,6 @@ const LipoStep = @import("src/build/LipoStep.zig");
const XCFrameworkStep = @import("src/build/XCFrameworkStep.zig"); const XCFrameworkStep = @import("src/build/XCFrameworkStep.zig");
const Version = @import("src/build/Version.zig"); const Version = @import("src/build/Version.zig");
const system_sdk = @import("vendor/mach-glfw/system_sdk.zig");
// Do a comptime Zig version requirement. The required Zig version is // Do a comptime Zig version requirement. The required Zig version is
// somewhat arbitrary: it is meant to be a version that we feel works well, // somewhat arbitrary: it is meant to be a version that we feel works well,
// but we liberally update it. In the future, we'll be more careful about // but we liberally update it. In the future, we'll be more careful about
@ -851,7 +849,6 @@ fn addSystemSDK(
step: *std.Build.CompileStep, step: *std.Build.CompileStep,
) !void { ) !void {
if (step.target.isDarwin()) { if (step.target.isDarwin()) {
system_sdk.include(b, step, .{});
try @import("apple_sdk").addPaths(b, step); try @import("apple_sdk").addPaths(b, step);
} }

2
pkg/apple-sdk/build.zig
View File

@ -35,7 +35,7 @@ pub fn addPaths(b: *std.Build, step: *std.build.CompileStep) !void {
); );
// https://github.com/ziglang/zig/issues/17358 // https://github.com/ziglang/zig/issues/17358
b.sysroot = xSdkPath("/zig-cache/xcode_frameworks"); if (step.target.isNative()) b.sysroot = xSdkPath("/zig-cache/xcode_frameworks");
step.addSystemFrameworkPath(.{ .path = xSdkPath("/zig-cache/xcode_frameworks/Frameworks") }); step.addSystemFrameworkPath(.{ .path = xSdkPath("/zig-cache/xcode_frameworks/Frameworks") });
step.addSystemIncludePath(.{ .path = xSdkPath("/zig-cache/xcode_frameworks/include") }); step.addSystemIncludePath(.{ .path = xSdkPath("/zig-cache/xcode_frameworks/include") });