UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow raylib to be built with zig 0.11.0 and zig 0.12.0dev (master) (#3506)

Browse source 
* allow zig 0.11.0 and 0.12.0dev to build raylib

* update comment
This commit is contained in:
freakmangd 2023-11-04 16:05:21 -04:00 • committed by GitHub
parent 32e4be6fb9
commit 39b539c42f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 46 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

86
src/build.zig
View file

@ -1,6 +1,7 @@
const std = @import("std"); const std = @import("std");
const builtin = @import("builtin");
// 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 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 { pub fn addRaylib(b: *std.Build, target: std.zig.CrossTarget, optimize: std.builtin.OptimizeMode, options: Options) *std.Build.CompileStep {
const raylib_flags = &[_][]const u8{ const raylib_flags = &[_][]const u8{
"-std=gnu99", "-std=gnu99",
@ -20,55 +21,37 @@ pub fn addRaylib(b: *std.Build, target: std.zig.CrossTarget, optimize: std.built
raylib.addIncludePath(.{ .path = srcdir ++ "/external/glfw/include" }); raylib.addIncludePath(.{ .path = srcdir ++ "/external/glfw/include" });
} }
raylib.addCSourceFiles( addCSourceFilesVersioned(raylib, &.{
&.{
srcdir ++ "/rcore.c", srcdir ++ "/rcore.c",
srcdir ++ "/utils.c", srcdir ++ "/utils.c",
}, }, raylib_flags);
raylib_flags,
);
if (options.raudio) { if (options.raudio) {
raylib.addCSourceFiles( addCSourceFilesVersioned(raylib, &.{
&.{
srcdir ++ "/raudio.c", srcdir ++ "/raudio.c",
}, }, raylib_flags);
raylib_flags,
);
} }
if (options.rmodels) { if (options.rmodels) {
raylib.addCSourceFiles( addCSourceFilesVersioned(raylib, &.{
&.{
srcdir ++ "/rmodels.c", srcdir ++ "/rmodels.c",
}, }, &[_][]const u8{
&[_][]const u8{
"-fno-sanitize=undefined", // https://github.com/raysan5/raylib/issues/1891 "-fno-sanitize=undefined", // https://github.com/raysan5/raylib/issues/1891
} ++ raylib_flags, } ++ raylib_flags);
);
} }
if (options.rshapes) { if (options.rshapes) {
raylib.addCSourceFiles( addCSourceFilesVersioned(raylib, &.{
&.{
srcdir ++ "/rshapes.c", srcdir ++ "/rshapes.c",
}, }, raylib_flags);
raylib_flags,
);
} }
if (options.rtext) { if (options.rtext) {
raylib.addCSourceFiles( addCSourceFilesVersioned(raylib, &.{
&.{
srcdir ++ "/rtext.c", srcdir ++ "/rtext.c",
}, }, raylib_flags);
raylib_flags,
);
} }
if (options.rtextures) { if (options.rtextures) {
raylib.addCSourceFiles( addCSourceFilesVersioned(raylib, &.{
&.{
srcdir ++ "/rtextures.c", srcdir ++ "/rtextures.c",
}, }, raylib_flags);
raylib_flags,
);
} }
var gen_step = b.addWriteFiles(); var gen_step = b.addWriteFiles();
@ -83,10 +66,9 @@ pub fn addRaylib(b: *std.Build, target: std.zig.CrossTarget, optimize: std.built
switch (target.getOsTag()) { switch (target.getOsTag()) {
.windows => { .windows => {
raylib.addCSourceFiles( addCSourceFilesVersioned(raylib, &.{
&.{srcdir ++ "/rglfw.c"}, srcdir ++ "/rglfw.c",
raylib_flags, }, raylib_flags);
);
raylib.linkSystemLibrary("winmm"); raylib.linkSystemLibrary("winmm");
raylib.linkSystemLibrary("gdi32"); raylib.linkSystemLibrary("gdi32");
raylib.linkSystemLibrary("opengl32"); raylib.linkSystemLibrary("opengl32");
@ -96,10 +78,9 @@ pub fn addRaylib(b: *std.Build, target: std.zig.CrossTarget, optimize: std.built
}, },
.linux => { .linux => {
if (!options.platform_drm) { if (!options.platform_drm) {
raylib.addCSourceFiles( addCSourceFilesVersioned(raylib, &.{
&.{srcdir ++ "/rglfw.c"}, srcdir ++ "/rglfw.c",
raylib_flags, }, raylib_flags);
);
raylib.linkSystemLibrary("GL"); raylib.linkSystemLibrary("GL");
raylib.linkSystemLibrary("rt"); raylib.linkSystemLibrary("rt");
raylib.linkSystemLibrary("dl"); raylib.linkSystemLibrary("dl");
@ -127,10 +108,9 @@ pub fn addRaylib(b: *std.Build, target: std.zig.CrossTarget, optimize: std.built
} }
}, },
.freebsd, .openbsd, .netbsd, .dragonfly => { .freebsd, .openbsd, .netbsd, .dragonfly => {
raylib.addCSourceFiles( addCSourceFilesVersioned(raylib, &.{
&.{srcdir ++ "/rglfw.c"}, srcdir ++ "/rglfw.c",
raylib_flags, }, raylib_flags);
);
raylib.linkSystemLibrary("GL"); raylib.linkSystemLibrary("GL");
raylib.linkSystemLibrary("rt"); raylib.linkSystemLibrary("rt");
raylib.linkSystemLibrary("dl"); raylib.linkSystemLibrary("dl");
@ -149,10 +129,9 @@ pub fn addRaylib(b: *std.Build, target: std.zig.CrossTarget, optimize: std.built
const raylib_flags_extra_macos = &[_][]const u8{ const raylib_flags_extra_macos = &[_][]const u8{
"-ObjC", "-ObjC",
}; };
raylib.addCSourceFiles( addCSourceFilesVersioned(raylib, &.{
&.{srcdir ++ "/rglfw.c"}, srcdir ++ "/rglfw.c",
raylib_flags ++ raylib_flags_extra_macos, }, raylib_flags ++ raylib_flags_extra_macos);
);
raylib.linkFramework("Foundation"); raylib.linkFramework("Foundation");
raylib.linkFramework("CoreServices"); raylib.linkFramework("CoreServices");
raylib.linkFramework("CoreGraphics"); raylib.linkFramework("CoreGraphics");
@ -235,3 +214,14 @@ const srcdir = struct {
return std.fs.path.dirname(@src().file).?; return std.fs.path.dirname(@src().file).?;
} }
}.getSrcDir(); }.getSrcDir();
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(.{
.files = files,
.flags = flags,
});
} else {
exe.addCSourceFiles(files, flags);
}
}