kubkon
commented
1 year ago Firstly, if we cross-compile, Zig doesn't autodetect sysroot and system include paths. It is up to the user to provide all of those via build.zig or otherwise. However, this has currently regressed as far as I can tell, but with https://github.com/ziglang/zig/pull/16818, here's how this would work (please note this is a working diff I was testing my changes against so it all works for me on M1 mac with Zig in cross-compilation mode):
diff --git a/build.zig b/build.zig
index fdaf678..201e341 100644
--- a/build.zig
+++ b/build.zig
@@ -34,7 +34,16 @@ pub fn build(b: *std.Build) void {
const raylib = raylib_build.addRaylib(b, target, optimize, .{});
exe.linkLibC();
exe.linkLibrary(raylib);
- exe.addIncludePath("deps/raylib/src");
+ exe.addIncludePath(.{ .cwd_relative = "deps/raylib/src" });
+
+ if (target.isDarwin() and !target.isNative()) {
+ if (b.sysroot == null) {
+ @panic(" Pass --sysroot <path/to/macOS/SDK>");
+ }
+ exe.addSystemIncludePath(.{ .path = b.pathJoin(&.{ b.sysroot.?, "/usr/include" }) });
+ exe.addLibraryPath(.{ .path = b.pathJoin(&.{ b.sysroot.?, "/usr/lib" }) });
+ exe.addFrameworkPath(.{ .path = b.pathJoin(&.{ b.sysroot.?, "/System/Library/Frameworks" }) });
+ }
// This *creates* a Run step in the build graph, to be executed when another
// step is evaluated that depends on it. The next line below will establishAnd changes to the raylib wrapper:
diff --git a/src/build.zig b/src/build.zig
index 64480a4f..e6c80e9b 100644
--- a/src/build.zig
+++ b/src/build.zig
@@ -1,4 +1,5 @@
const std = @import("std");
+const builtin = @import("builtin");
// This has been tested to work with zig master branch as of commit 87de821 or May 14 2023
pub fn addRaylib(b: *std.Build, target: std.zig.CrossTarget, optimize: std.builtin.OptimizeMode, options: Options) *std.Build.CompileStep {
@@ -18,7 +19,7 @@ pub fn addRaylib(b: *std.Build, target: std.zig.CrossTarget, optimize: std.built
// No GLFW required on PLATFORM_DRM
if (!options.platform_drm) {
- raylib.addIncludePath(srcdir ++ "/external/glfw/include");
+ raylib.addIncludePath(.{ .cwd_relative = srcdir ++ "/external/glfw/include" });
}
raylib.addCSourceFiles(&.{
@@ -36,9 +37,9 @@ pub fn addRaylib(b: *std.Build, target: std.zig.CrossTarget, optimize: std.built
if (options.raygui) {
_ = gen_step.add(srcdir ++ "/raygui.c", "#define RAYGUI_IMPLEMENTATION\n#include \"raygui.h\"\n");
- raylib.addCSourceFile(srcdir ++ "/raygui.c", raylib_flags);
- raylib.addIncludePath(srcdir);
- raylib.addIncludePath(srcdir ++ "/../../raygui/src");
+ raylib.addCSourceFile(.{ .file = .{ .cwd_relative = srcdir ++ "/raygui.c" }, .flags = raylib_flags });
+ raylib.addIncludePath(.{ .cwd_relative = srcdir });
+ raylib.addIncludePath(.{ .cwd_relative = srcdir ++ "/../../raygui/src" });
}
switch (target.getOsTag()) {
@@ -47,7 +48,7 @@ pub fn addRaylib(b: *std.Build, target: std.zig.CrossTarget, optimize: std.built
raylib.linkSystemLibrary("winmm");
raylib.linkSystemLibrary("gdi32");
raylib.linkSystemLibrary("opengl32");
- raylib.addIncludePath("external/glfw/deps/mingw");
+ raylib.addIncludePath(.{ .cwd_relative = "external/glfw/deps/mingw" });
raylib.defineCMacro("PLATFORM_DESKTOP", null);
},
@@ -59,7 +60,7 @@ pub fn addRaylib(b: *std.Build, target: std.zig.CrossTarget, optimize: std.built
raylib.linkSystemLibrary("dl");
raylib.linkSystemLibrary("m");
raylib.linkSystemLibrary("X11");
- raylib.addIncludePath("/usr/include");
+ raylib.addIncludePath(.{ .cwd_relative = "/usr/include" });
raylib.defineCMacro("PLATFORM_DESKTOP", null);
} else {
@@ -71,7 +72,7 @@ pub fn addRaylib(b: *std.Build, target: std.zig.CrossTarget, optimize: std.built
raylib.linkSystemLibrary("rt");
raylib.linkSystemLibrary("m");
raylib.linkSystemLibrary("dl");
- raylib.addIncludePath("/usr/include/libdrm");
+ raylib.addIncludePath(.{ .cwd_relative = "/usr/include/libdrm" });
raylib.defineCMacro("PLATFORM_DRM", null);
raylib.defineCMacro("GRAPHICS_API_OPENGL_ES2", null);
@@ -95,6 +96,14 @@ pub fn addRaylib(b: *std.Build, target: std.zig.CrossTarget, optimize: std.built
raylib.defineCMacro("PLATFORM_DESKTOP", null);
},
.macos => {
+ if (!target.isNative()) {
+ if (b.sysroot == null) {
+ @panic(" Pass --sysroot <path/to/macOS/SDK>");
+ }
+ raylib.addSystemIncludePath(.{ .path = b.pathJoin(&.{ b.sysroot.?, "/usr/include" }) });
+ raylib.addLibraryPath(.{ .path = b.pathJoin(&.{ b.sysroot.?, "/usr/lib" }) });
+ raylib.addFrameworkPath(.{ .path = b.pathJoin(&.{ b.sysroot.?, "/System/Library/Frameworks" }) });
+ }
// On macos rglfw.c include Objective-C files.
const raylib_flags_extra_macos = &[_][]const u8{
"-ObjC",
@@ -125,7 +134,7 @@ pub fn addRaylib(b: *std.Build, target: std.zig.CrossTarget, optimize: std.built
var dir = std.fs.openDirAbsolute(cache_include, std.fs.Dir.OpenDirOptions{ .access_sub_paths = true, .no_follow = true }) catch @panic("No emscripten cache. Generate it!");
dir.close();
- raylib.addIncludePath(cache_include);
+ raylib.addIncludePath(.{ .path = cache_include });
},
else => {
@panic("Unsupported OS");
ghostbutter-games
marrony
i-am-the-slime
Zig Version
0.11.0-dev.4059+17255bed4
Steps to Reproduce and Observed Behavior
I uploaded a minimal example project that you can
git cloneto reproduce the issue: https://github.com/konsuko/zraylibtestPlease note that I am using macOS with the M1 CPU, version 13.3.1, but I believe this issues also appears on Windows (when a friend tested the same source code)
Expected Behavior
I am on macOS Ventura 13.3.1 (latest) and have a problem:
When compiling a minimal example project that uses Raylib (a C library for game development), I am encountering an error that I think might be a compiler bug:
When using
zig buildorzig build run, everything works as expected and I have no errors: A window with a white background and an FPS counter opens up.When I try to (cross) compile from/to aarch64 macOS by using
zig build -Dtarget=aarch64-macos, I am getting clang errors:I did some digging through other issues on Github and found this similar issue: https://github.com/ziglang/zig/issues/16235 I am not sure, but it looks like maybe the compiler is not finding macOS dylibs, even though they should exist on my machine (I have XCode command line tools installed and updated to the latest version).
Probably something that @kubkon would know more about?
I apologize if it's just me doing something dumb here and possibly an easy fix, I am very new to Zig and still learning :)