From 9534f48425bb87e205406fe950b606a2186ccaac Mon Sep 17 00:00:00 2001 From: Michael Scherbakow Date: Tue, 17 Oct 2023 23:36:42 +0200 Subject: [PATCH] fix build.zig (#3433) for zig master (2023-10-17) --- src/build.zig | 83 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 55 insertions(+), 28 deletions(-) diff --git a/src/build.zig b/src/build.zig index 5d7ddbf3f..5e2b5916e 100644 --- a/src/build.zig +++ b/src/build.zig @@ -20,37 +20,55 @@ pub fn addRaylib(b: *std.Build, target: std.zig.CrossTarget, optimize: std.built raylib.addIncludePath(.{ .path = srcdir ++ "/external/glfw/include" }); } - raylib.addCSourceFiles(&.{ - srcdir ++ "/rcore.c", - srcdir ++ "/utils.c", - }, raylib_flags); + raylib.addCSourceFiles(.{ + .files = &.{ + srcdir ++ "/rcore.c", + srcdir ++ "/utils.c", + }, + .flags = raylib_flags, + }); if (options.raudio) { - raylib.addCSourceFiles(&.{ - srcdir ++ "/raudio.c", - }, raylib_flags); + raylib.addCSourceFiles(.{ + .files = &.{ + srcdir ++ "/raudio.c", + }, + .flags = raylib_flags, + }); } if (options.rmodels) { - raylib.addCSourceFiles(&.{ - srcdir ++ "/rmodels.c", - }, &[_][]const u8{ - "-fno-sanitize=undefined", // https://github.com/raysan5/raylib/issues/1891 - } ++ raylib_flags); + raylib.addCSourceFiles(.{ + .files = &.{ + srcdir ++ "/rmodels.c", + }, + .flags = &[_][]const u8{ + "-fno-sanitize=undefined", // https://github.com/raysan5/raylib/issues/1891 + } ++ raylib_flags, + }); } if (options.rshapes) { - raylib.addCSourceFiles(&.{ - srcdir ++ "/rshapes.c", - }, raylib_flags); + raylib.addCSourceFiles(.{ + .files = &.{ + srcdir ++ "/rshapes.c", + }, + .flags = raylib_flags, + }); } if (options.rtext) { - raylib.addCSourceFiles(&.{ - srcdir ++ "/rtext.c", - }, raylib_flags); + raylib.addCSourceFiles(.{ + .files = &.{ + srcdir ++ "/rtext.c", + }, + .flags = raylib_flags, + }); } if (options.rtextures) { - raylib.addCSourceFiles(&.{ - srcdir ++ "/rtextures.c", - }, raylib_flags); + raylib.addCSourceFiles(.{ + .files = &.{ + srcdir ++ "/rtextures.c", + }, + .flags = raylib_flags, + }); } var gen_step = b.addWriteFiles(); @@ -65,7 +83,10 @@ pub fn addRaylib(b: *std.Build, target: std.zig.CrossTarget, optimize: std.built switch (target.getOsTag()) { .windows => { - raylib.addCSourceFiles(&.{srcdir ++ "/rglfw.c"}, raylib_flags); + raylib.addCSourceFiles(.{ + .files = &.{srcdir ++ "/rglfw.c"}, + .flags = raylib_flags, + }); raylib.linkSystemLibrary("winmm"); raylib.linkSystemLibrary("gdi32"); raylib.linkSystemLibrary("opengl32"); @@ -75,7 +96,10 @@ pub fn addRaylib(b: *std.Build, target: std.zig.CrossTarget, optimize: std.built }, .linux => { if (!options.platform_drm) { - raylib.addCSourceFiles(&.{srcdir ++ "/rglfw.c"}, raylib_flags); + raylib.addCSourceFiles(.{ + .files = &.{srcdir ++ "/rglfw.c"}, + .flags = raylib_flags, + }); raylib.linkSystemLibrary("GL"); raylib.linkSystemLibrary("rt"); raylib.linkSystemLibrary("dl"); @@ -103,7 +127,10 @@ pub fn addRaylib(b: *std.Build, target: std.zig.CrossTarget, optimize: std.built } }, .freebsd, .openbsd, .netbsd, .dragonfly => { - raylib.addCSourceFiles(&.{srcdir ++ "/rglfw.c"}, raylib_flags); + raylib.addCSourceFiles(.{ + .files = &.{srcdir ++ "/rglfw.c"}, + .flags = raylib_flags, + }); raylib.linkSystemLibrary("GL"); raylib.linkSystemLibrary("rt"); raylib.linkSystemLibrary("dl"); @@ -122,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( - &.{srcdir ++ "/rglfw.c"}, - raylib_flags ++ raylib_flags_extra_macos, - ); + raylib.addCSourceFiles(.{ + .files = &.{srcdir ++ "/rglfw.c"}, + .flags = raylib_flags ++ raylib_flags_extra_macos, + }); raylib.linkFramework("Foundation"); raylib.linkFramework("CoreServices"); raylib.linkFramework("CoreGraphics");