From 95a1c924b51369147d09a705e5088414acfe258b Mon Sep 17 00:00:00 2001 From: freakmangd <53349189+freakmangd@users.noreply.github.com> Date: Mon, 8 Jan 2024 21:26:49 -0500 Subject: [PATCH] update build.zig for latest zig 0.12.0dev while still allowing 0.11.0 --- src/build.zig | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/build.zig b/src/build.zig index a574ad632..aa80bb78b 100644 --- a/src/build.zig +++ b/src/build.zig @@ -1,8 +1,12 @@ const std = @import("std"); const builtin = @import("builtin"); -// This has been tested to work with zig 0.11.0 and zig 0.12.0-dev.1390+94cee4fb2 -pub fn addRaylib(b: *std.Build, target: std.zig.CrossTarget, optimize: std.builtin.OptimizeMode, options: Options) *std.Build.CompileStep { +// This has been tested to work with zig 0.11.0 and zig 0.12.0-dev.2075+f5978181e +// +// anytype is used here for target because in 0.12.0dev the std.zig.CrossTarget type +// was reworked into std.Target.Query and std.Build.ResolvedTarget. Using anytype allows +// us to accept both types and act accordingly in getOsTagVersioned +pub fn addRaylib(b: *std.Build, target: anytype, optimize: std.builtin.OptimizeMode, options: Options) *std.Build.Step.Compile { const raylib_flags = &[_][]const u8{ "-std=gnu99", "-D_GNU_SOURCE", @@ -68,7 +72,7 @@ pub fn addRaylib(b: *std.Build, target: std.zig.CrossTarget, optimize: std.built raylib.addIncludePath(.{ .path = srcdir ++ "/../../raygui/src" }); } - switch (target.getOsTag()) { + switch (getOsTagVersioned(target)) { .windows => { addCSourceFilesVersioned(raylib, &.{ srcdir ++ "/rglfw.c", @@ -219,6 +223,14 @@ const srcdir = struct { } }.getSrcDir(); +fn getOsTagVersioned(target: anytype) std.Target.Os.Tag { + if (comptime builtin.zig_version.minor >= 12) { + return target.result.os.tag; + } else { + return target.getOsTag(); + } +} + fn addCSourceFilesVersioned(exe: *std.Build.Step.Compile, files: []const []const u8, flags: []const []const u8) void { if (comptime builtin.zig_version.minor >= 12) { exe.addCSourceFiles(.{