Skip to content

fix/macos: Crosscompilation not working from linux using xcode-framew… #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SimoneFelici wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −7
Open

fix/macos: Crosscompilation not working from linux using xcode-framew… #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ pub fn build(b: *std.Build) !void {
else
linux.build(b, target.result, lib, build_config_h),
.windows => windows.build(b, target.result, lib, build_config_h),
.macos => macos.build(b, target.result, lib, build_config_h),
.macos => macos.build(b, target.result, lib, build_config_h, system_paths),
.ios => ios.build(b, target.result, lib, build_config_h, system_paths),
else => @panic("target has no default config"),
}
Expand Down
11 changes: 5 additions & 6 deletions src/macos.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,15 @@ const root = @import("../build.zig");
const Subsystems = root.Subsystems;
const AllDrivers = root.Drivers;

pub fn build(
b: *std.Build,
target: std.Target,
lib: *std.Build.Step.Compile,
build_config_h: *std.Build.Step.ConfigHeader,
) void {
pub fn build(b: *std.Build, target: std.Target, lib: *std.Build.Step.Compile, build_config_h: *std.Build.Step.ConfigHeader, paths: root.SystemPaths) void {
_ = target;

const upstream = b.dependency("sdl", .{});

if (paths.include) |p| lib.root_module.addSystemIncludePath(p);
if (paths.framework) |p| lib.root_module.addSystemFrameworkPath(p);
if (paths.library) |p| lib.root_module.addLibraryPath(p);

// Link with the platform specific system frameworks
lib.root_module.linkFramework("Cocoa", .{});
lib.root_module.linkFramework("IOKit", .{});
Expand Down