MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix win32, mac build bugs in build.zig

Browse Source
This commit is contained in:
haxsam 2026-04-18 11:18:53 +02:00
parent d1e55aeb66
commit 1bd658fed9
No known key found for this signature in database
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
build.zig
View File

@ -88,7 +88,7 @@ pub fn linkWindows(mod: *std.Build.Module, opengl: bool, comptime lshcore: bool)
if (opengl) mod.linkSystemLibrary("opengl32", .{}); if (opengl) mod.linkSystemLibrary("opengl32", .{});
mod.linkSystemLibrary("winmm", .{}); mod.linkSystemLibrary("winmm", .{});
mod.linkSystemLibrary("gdi32", .{}); mod.linkSystemLibrary("gdi32", .{});
if (lshcore) mod.linkSystemLibrary("lshcore", .{}); if (lshcore) mod.linkSystemLibrary("shcore", .{});
} }
fn findWaylandScanner(b: *std.Build) void { fn findWaylandScanner(b: *std.Build) void {
@ -122,13 +122,8 @@ pub fn linkLinux(mod: *std.Build.Module, comptime display_backend: LinuxDisplayB
} }
} }
pub fn linkBSD(b: *std.Build, mod: *std.Build.Module) void { pub fn linkBSD(_: *std.Build, mod: *std.Build.Module) void {
mod.linkSystemLibrary("GL", .{}); mod.linkSystemLibrary("GL", .{});
mod.addSystemIncludePath(b.path("/usr/local/include/"));
mod.addSystemIncludePath(b.path("/usr/pkg/include"));
mod.addSystemIncludePath(b.path("/usr/X11R7/include"));
mod.addRPath(b.path("/usr/pkg/lib"));
} }
pub fn linkMacOS(b: *std.Build, mod: *std.Build.Module) void { pub fn linkMacOS(b: *std.Build, mod: *std.Build.Module) void {
@ -392,8 +387,6 @@ fn compileRaylib(b: *std.Build, target: std.Build.ResolvedTarget, optimize: std.
try raylib_flags_arr.append("-Werror=implicit-function-declaration"); try raylib_flags_arr.append("-Werror=implicit-function-declaration");
raylib_mod.addSystemIncludePath(b.path("/usr/include/libdrm"));
raylib_mod.linkSystemLibrary("libdrm", .{ .use_pkg_config = .force }); raylib_mod.linkSystemLibrary("libdrm", .{ .use_pkg_config = .force });
raylib_mod.linkSystemLibrary("drm", .{}); raylib_mod.linkSystemLibrary("drm", .{});
raylib_mod.linkSystemLibrary("gbm", .{}); raylib_mod.linkSystemLibrary("gbm", .{});
@ -693,6 +686,8 @@ fn addExamples(
exe_mod.addIncludePath(b.path("src/external/glfw/include")); exe_mod.addIncludePath(b.path("src/external/glfw/include"));
} }
if (std.mem.eql(u8, filename, "raylib_opengl_interop")) { if (std.mem.eql(u8, filename, "raylib_opengl_interop")) {
if (platform == .drm) continue;
if (target.result.os.tag == .macos) continue;
exe_mod.addIncludePath(b.path("src/external")); exe_mod.addIncludePath(b.path("src/external"));
} }
@ -707,7 +702,7 @@ fn addExamples(
.root_module = exe_mod, .root_module = exe_mod,
}); });
const install_dir: std.Build.InstallDir = .{ .custom = "web" }; const install_dir: std.Build.InstallDir = .{ .custom = b.fmt("web/{s}/{s}", .{ module, filename }) };
const emcc_flags = emsdk.emccDefaultFlags(b.allocator, .{ .optimize = optimize }); const emcc_flags = emsdk.emccDefaultFlags(b.allocator, .{ .optimize = optimize });
const emcc_settings = emsdk.emccDefaultSettings(b.allocator, .{ .optimize = optimize }); const emcc_settings = emsdk.emccDefaultSettings(b.allocator, .{ .optimize = optimize });
@ -740,7 +735,7 @@ fn addExamples(
}); });
b.installArtifact(exe); b.installArtifact(exe);
const install_cmd = b.addInstallArtifact(exe, .{}); const install_cmd = b.addInstallArtifact(exe, .{ .dest_sub_path = b.fmt("{s}/{s}", .{ module, filename }) });
const run_cmd = b.addRunArtifact(exe); const run_cmd = b.addRunArtifact(exe);
run_cmd.cwd = b.path(module_subpath); run_cmd.cwd = b.path(module_subpath);

1
build.zig.zon
View File

@ -23,7 +23,6 @@
.zemscripten = .{ .zemscripten = .{
.url = "git+https://github.com/zig-gamedev/zemscripten#3fa4b778852226c7346bdcc3c1486e875a9a6d02", .url = "git+https://github.com/zig-gamedev/zemscripten#3fa4b778852226c7346bdcc3c1486e875a9a6d02",
.hash = "zemscripten-0.2.0-dev-sRlDqApRAACspTbAZnuNKWIzfWzSYgYkb2nWAXZ-tqqt", .hash = "zemscripten-0.2.0-dev-sRlDqApRAACspTbAZnuNKWIzfWzSYgYkb2nWAXZ-tqqt",
.lazy = true,
}, },
}, },