From ba75a7a23bbfcae1747ab6a87ecb155979ce6bc5 Mon Sep 17 00:00:00 2001 From: Caleb Barger <59521636+cabarger@users.noreply.github.com> Date: Thu, 2 Nov 2023 01:14:34 -0700 Subject: [PATCH] build.zig updates for 0.11.0 release. (#3501) --- build.zig | 2 +- src/build.zig | 80 +++++++++++++++++++++++++-------------------------- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/build.zig b/build.zig index 21638601d..f4d7d1590 100644 --- a/build.zig +++ b/build.zig @@ -1,7 +1,7 @@ const std = @import("std"); const raylib = @import("src/build.zig"); -// This has been tested to work with zig 0.11.0 (67709b6, Aug 4 2023) +// This has been tested to work with zig 0.11.0 pub fn build(b: *std.Build) void { raylib.build(b); } diff --git a/src/build.zig b/src/build.zig index 5e2b5916e..08f4b6bdf 100644 --- a/src/build.zig +++ b/src/build.zig @@ -20,55 +20,55 @@ pub fn addRaylib(b: *std.Build, target: std.zig.CrossTarget, optimize: std.built raylib.addIncludePath(.{ .path = srcdir ++ "/external/glfw/include" }); } - raylib.addCSourceFiles(.{ - .files = &.{ + raylib.addCSourceFiles( + &.{ srcdir ++ "/rcore.c", srcdir ++ "/utils.c", }, - .flags = raylib_flags, - }); + raylib_flags, + ); if (options.raudio) { - raylib.addCSourceFiles(.{ - .files = &.{ + raylib.addCSourceFiles( + &.{ srcdir ++ "/raudio.c", }, - .flags = raylib_flags, - }); + raylib_flags, + ); } if (options.rmodels) { - raylib.addCSourceFiles(.{ - .files = &.{ + raylib.addCSourceFiles( + &.{ srcdir ++ "/rmodels.c", }, - .flags = &[_][]const u8{ + &[_][]const u8{ "-fno-sanitize=undefined", // https://github.com/raysan5/raylib/issues/1891 } ++ raylib_flags, - }); + ); } if (options.rshapes) { - raylib.addCSourceFiles(.{ - .files = &.{ + raylib.addCSourceFiles( + &.{ srcdir ++ "/rshapes.c", }, - .flags = raylib_flags, - }); + raylib_flags, + ); } if (options.rtext) { - raylib.addCSourceFiles(.{ - .files = &.{ + raylib.addCSourceFiles( + &.{ srcdir ++ "/rtext.c", }, - .flags = raylib_flags, - }); + raylib_flags, + ); } if (options.rtextures) { - raylib.addCSourceFiles(.{ - .files = &.{ + raylib.addCSourceFiles( + &.{ srcdir ++ "/rtextures.c", }, - .flags = raylib_flags, - }); + raylib_flags, + ); } var gen_step = b.addWriteFiles(); @@ -83,10 +83,10 @@ pub fn addRaylib(b: *std.Build, target: std.zig.CrossTarget, optimize: std.built switch (target.getOsTag()) { .windows => { - raylib.addCSourceFiles(.{ - .files = &.{srcdir ++ "/rglfw.c"}, - .flags = raylib_flags, - }); + raylib.addCSourceFiles( + &.{srcdir ++ "/rglfw.c"}, + raylib_flags, + ); raylib.linkSystemLibrary("winmm"); raylib.linkSystemLibrary("gdi32"); raylib.linkSystemLibrary("opengl32"); @@ -96,10 +96,10 @@ pub fn addRaylib(b: *std.Build, target: std.zig.CrossTarget, optimize: std.built }, .linux => { if (!options.platform_drm) { - raylib.addCSourceFiles(.{ - .files = &.{srcdir ++ "/rglfw.c"}, - .flags = raylib_flags, - }); + raylib.addCSourceFiles( + &.{srcdir ++ "/rglfw.c"}, + raylib_flags, + ); raylib.linkSystemLibrary("GL"); raylib.linkSystemLibrary("rt"); raylib.linkSystemLibrary("dl"); @@ -127,10 +127,10 @@ pub fn addRaylib(b: *std.Build, target: std.zig.CrossTarget, optimize: std.built } }, .freebsd, .openbsd, .netbsd, .dragonfly => { - raylib.addCSourceFiles(.{ - .files = &.{srcdir ++ "/rglfw.c"}, - .flags = raylib_flags, - }); + raylib.addCSourceFiles( + &.{srcdir ++ "/rglfw.c"}, + raylib_flags, + ); raylib.linkSystemLibrary("GL"); raylib.linkSystemLibrary("rt"); raylib.linkSystemLibrary("dl"); @@ -149,10 +149,10 @@ pub fn addRaylib(b: *std.Build, target: std.zig.CrossTarget, optimize: std.built const raylib_flags_extra_macos = &[_][]const u8{ "-ObjC", }; - raylib.addCSourceFiles(.{ - .files = &.{srcdir ++ "/rglfw.c"}, - .flags = raylib_flags ++ raylib_flags_extra_macos, - }); + raylib.addCSourceFiles( + &.{srcdir ++ "/rglfw.c"}, + raylib_flags ++ raylib_flags_extra_macos, + ); raylib.linkFramework("Foundation"); raylib.linkFramework("CoreServices"); raylib.linkFramework("CoreGraphics");