falsepattern/zig-glfw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

new approach to mac SDK inclusion

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2021-09-12 12:22:15 -07:00 • committed by Stephen Gutekanst
parent 464dc5d8ea
commit 73719acb29
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
glfw/build.zig
View file

@ -229,20 +229,17 @@ fn linkGLFW(b: *Builder, step: *std.build.LibExeObjStep, options: Options) void
} }
fn includeSdkMacOS(b: *Builder, step: *std.build.LibExeObjStep) void { fn includeSdkMacOS(b: *Builder, step: *std.build.LibExeObjStep) void {
step.addFrameworkDir("/System/Library/Frameworks");
step.addSystemIncludeDir("/usr/include");
step.addLibPath("/usr/lib");
// Add the SDK as a sysroot. Using this instead of, say, absolute framework/include/lib paths
// to the SDK without a sysroot ensures that we use the same libraries/frameworks/headers on
// Mac hosts and non-Mac hosts.
const sdk_root_dir = getSdkRoot(b.allocator, "sdk-macos-11.3") catch unreachable; const sdk_root_dir = getSdkRoot(b.allocator, "sdk-macos-11.3") catch unreachable;
defer b.allocator.free(sdk_root_dir); defer b.allocator.free(sdk_root_dir);
var sdk_sysroot = std.fs.path.join(b.allocator, &.{ sdk_root_dir, "root/" }) catch unreachable;
var sdk_root_frameworks = std.fs.path.join(b.allocator, &.{ sdk_root_dir, "root/System/Library/Frameworks" }) catch unreachable; b.sysroot = sdk_sysroot;
defer b.allocator.free(sdk_root_frameworks);
step.addFrameworkDir(sdk_root_frameworks);
var sdk_root_includes = std.fs.path.join(b.allocator, &.{ sdk_root_dir, "root/usr/include" }) catch unreachable;
defer b.allocator.free(sdk_root_includes);
step.addSystemIncludeDir(sdk_root_includes);
var sdk_root_libs = std.fs.path.join(b.allocator, &.{ sdk_root_dir, "root/usr/lib" }) catch unreachable;
defer b.allocator.free(sdk_root_libs);
step.addLibPath(sdk_root_libs);
} }
fn includeSdkLinuxX8664(b: *Builder, step: *std.build.LibExeObjStep) void { fn includeSdkLinuxX8664(b: *Builder, step: *std.build.LibExeObjStep) void {