Skip to content

build.zig updates for 0.11.0 release. #3501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 2, 2023
+41 −41
Merged

build.zig updates for 0.11.0 release. #3501

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.zig
View file
Original file line number Diff line number Diff line change
@@ -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);
}
80 changes: 40 additions & 40 deletions src/build.zig
View file
Original file line number Diff line number Diff line change
@@ -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");