summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authoriarkn <[email protected]>2024-04-05 17:55:23 +0700
committerGitHub <[email protected]>2024-04-05 12:55:23 +0200
commit414229bcf93816daaa253a82cd54fbd7b18e6449 (patch)
tree0fea65bdd4f98bc2b56515bc3f9403f442516e70 /src
parent890058abcd6e3c03fe2c59ebb416db1e8b75446f (diff)
downloadraylib-414229bcf93816daaa253a82cd54fbd7b18e6449.tar.gz
raylib-414229bcf93816daaa253a82cd54fbd7b18e6449.zip
Fix #3891 breaking builds for Zig v0.11.0 (#3896)
The changes brought by #3891 uses `std.process.Child.run` which was renamed from `std.process.Child.exec` in Zig version 0.11.0. This commit adds a version check to use the appropriate function names. Additionally, the `linux_display_backend` configuration option is added so users can set it when running `zig build` with the `-D` option or when using raylib as a dependency.
Diffstat (limited to 'src')
-rw-r--r--src/build.zig41
1 files changed, 23 insertions, 18 deletions
diff --git a/src/build.zig b/src/build.zig
index 93ffe47a..91cd9cb1 100644
--- a/src/build.zig
+++ b/src/build.zig
@@ -254,6 +254,7 @@ pub fn build(b: *std.Build) !void {
.rshapes = b.option(bool, "rshapes", "Compile with shapes support") orelse defaults.rshapes,
.raygui = b.option(bool, "raygui", "Compile with raygui support") orelse defaults.raygui,
.shared = b.option(bool, "shared", "Compile as shared library") orelse defaults.shared,
+ .linux_display_backend = b.option(LinuxDisplayBackend, "linux_display_backend", "Linux display backend to use") orelse defaults.linux_display_backend,
};
const lib = try addRaylib(b, target, optimize, options);
@@ -306,24 +307,28 @@ fn addCSourceFilesVersioned(
}
fn waylandGenerate(allocator: std.mem.Allocator, comptime protocol: []const u8, comptime basename: []const u8) !void {
- _ = try std.process.Child.run(.{
- .allocator = allocator,
- .argv = &[_][]const u8{
- "wayland-scanner",
- "client-header",
- waylandDir ++ "/" ++ protocol,
- srcdir ++ "/" ++ basename ++ ".h",
- },
- });
- _ = try std.process.Child.run(.{
- .allocator = allocator,
- .argv = &[_][]const u8{
- "wayland-scanner",
- "private-code",
- waylandDir ++ "/" ++ protocol,
- srcdir ++ "/" ++ basename ++ "-code.h",
- },
- });
+ const protocolDir = waylandDir ++ "/" ++ protocol;
+ const clientHeader = srcdir ++ "/" ++ basename ++ ".h";
+ const privateCode = srcdir ++ "/" ++ basename ++ "-code.h";
+ if (comptime builtin.zig_version.minor >= 12) {
+ _ = try std.process.Child.run(.{
+ .allocator = allocator,
+ .argv = &[_][]const u8{ "wayland-scanner", "client-header", protocolDir, clientHeader },
+ });
+ _ = try std.process.Child.run(.{
+ .allocator = allocator,
+ .argv = &[_][]const u8{ "wayland-scanner", "private-code", protocolDir, privateCode },
+ });
+ } else {
+ _ = try std.process.Child.exec(.{
+ .allocator = allocator,
+ .argv = &[_][]const u8{ "wayland-scanner", "client-header", protocolDir, clientHeader },
+ });
+ _ = try std.process.Child.exec(.{
+ .allocator = allocator,
+ .argv = &[_][]const u8{ "wayland-scanner", "private-code", protocolDir, privateCode },
+ });
+ }
}
fn join2(allocator: std.mem.Allocator, path1: []const u8, path2: []const u8) ![]u8 {