summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorstar-tek-mb <[email protected]>2023-02-05 17:03:03 +0500
committerGitHub <[email protected]>2023-02-05 13:03:03 +0100
commitff70a04bf5e2aea84fe9d71cede790e1a031f810 (patch)
treebff602ff0e2c1622e683e7b1bcc7222931639d12
parent60d0ab418a3011fe5df663ac4be37ee53bcc5393 (diff)
downloadraylib-ff70a04bf5e2aea84fe9d71cede790e1a031f810.tar.gz
raylib-ff70a04bf5e2aea84fe9d71cede790e1a031f810.zip
update zig build to latest master (#2910)
also, adds package manager support
-rw-r--r--build.zig18
-rw-r--r--examples/build.zig34
-rw-r--r--src/build.zig15
3 files changed, 47 insertions, 20 deletions
diff --git a/build.zig b/build.zig
new file mode 100644
index 00000000..9959d8e0
--- /dev/null
+++ b/build.zig
@@ -0,0 +1,18 @@
+const std = @import("std");
+const raylib = @import("src/build.zig");
+
+pub fn build(b: *std.Build) void {
+ // Standard target options allows the person running `zig build` to choose
+ // what target to build for. Here we do not override the defaults, which
+ // means any target is allowed, and the default is native. Other options
+ // for restricting supported target set are available.
+ const target = b.standardTargetOptions(.{});
+ // Standard optimization options allow the person running `zig build` to select
+ // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. Here we do not
+ // set a preferred release mode, allowing the user to decide how to optimize.
+ const optimize = b.standardOptimizeOption(.{});
+
+ const lib = raylib.addRaylib(b, target, optimize);
+ lib.installHeader("src/raylib.h", "raylib.h");
+ lib.install();
+} \ No newline at end of file
diff --git a/examples/build.zig b/examples/build.zig
index eb040fd2..c0479910 100644
--- a/examples/build.zig
+++ b/examples/build.zig
@@ -1,15 +1,11 @@
const std = @import("std");
const builtin = @import("builtin");
-fn add_module(comptime module: []const u8, b: *std.build.Builder, target: std.zig.CrossTarget) !*std.build.Step {
+fn add_module(comptime module: []const u8, b: *std.build.Builder, target: std.zig.CrossTarget, optimize: std.builtin.OptimizeMode) !*std.build.Step {
if (target.getOsTag() == .emscripten) {
@panic("Emscripten building via Zig unsupported");
}
- // Standard release options allow the person running `zig build` to select
- // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall.
- const mode = b.standardReleaseOptions();
-
const all = b.step(module, "All " ++ module ++ " examples");
const dir = try std.fs.cwd().openIterableDir(module, .{});
var iter = dir.iterate();
@@ -22,10 +18,12 @@ fn add_module(comptime module: []const u8, b: *std.build.Builder, target: std.zi
// zig's mingw headers do not include pthread.h
if (std.mem.eql(u8, "core_loading_thread", name) and target.getOsTag() == .windows) continue;
- const exe = b.addExecutable(name, null);
+ const exe = b.addExecutable(.{
+ .name = name,
+ .target = target,
+ .optimize = optimize,
+ });
exe.addCSourceFile(path, &[_][]const u8{});
- exe.setTarget(target);
- exe.setBuildMode(mode);
exe.linkLibC();
exe.addObjectFile(switch (target.getOsTag()) {
.windows => "../src/raylib.lib",
@@ -89,15 +87,19 @@ pub fn build(b: *std.build.Builder) !void {
// means any target is allowed, and the default is native. Other options
// for restricting supported target set are available.
const target = b.standardTargetOptions(.{});
+ // Standard optimization options allow the person running `zig build` to select
+ // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. Here we do not
+ // set a preferred release mode, allowing the user to decide how to optimize.
+ const optimize = b.standardOptimizeOption(.{});
const all = b.getInstallStep();
- all.dependOn(try add_module("audio", b, target));
- all.dependOn(try add_module("core", b, target));
- all.dependOn(try add_module("models", b, target));
- all.dependOn(try add_module("others", b, target));
- all.dependOn(try add_module("shaders", b, target));
- all.dependOn(try add_module("shapes", b, target));
- all.dependOn(try add_module("text", b, target));
- all.dependOn(try add_module("textures", b, target));
+ all.dependOn(try add_module("audio", b, target, optimize));
+ all.dependOn(try add_module("core", b, target, optimize));
+ all.dependOn(try add_module("models", b, target, optimize));
+ all.dependOn(try add_module("others", b, target, optimize));
+ all.dependOn(try add_module("shaders", b, target, optimize));
+ all.dependOn(try add_module("shapes", b, target, optimize));
+ all.dependOn(try add_module("text", b, target, optimize));
+ all.dependOn(try add_module("textures", b, target, optimize));
}
diff --git a/src/build.zig b/src/build.zig
index 919db3e9..adf7fdc9 100644
--- a/src/build.zig
+++ b/src/build.zig
@@ -1,6 +1,6 @@
const std = @import("std");
-pub fn addRaylib(b: *std.build.Builder, target: std.zig.CrossTarget) *std.build.LibExeObjStep {
+pub fn addRaylib(b: *std.build.Builder, target: std.zig.CrossTarget, optimize: std.builtin.OptimizeMode) *std.build.LibExeObjStep {
const raylib_flags = &[_][]const u8{
"-std=gnu99",
"-D_GNU_SOURCE",
@@ -8,8 +8,11 @@ pub fn addRaylib(b: *std.build.Builder, target: std.zig.CrossTarget) *std.build.
"-fno-sanitize=undefined", // https://github.com/raysan5/raylib/issues/1891
};
- const raylib = b.addStaticLibrary("raylib", null);
- raylib.setTarget(target);
+ const raylib = b.addStaticLibrary(.{
+ .name = "raylib",
+ .target = target,
+ .optimize = optimize,
+ });
raylib.linkLibC();
raylib.addIncludePath(srcdir ++ "/external/glfw/include");
@@ -106,8 +109,12 @@ pub fn build(b: *std.build.Builder) void {
// means any target is allowed, and the default is native. Other options
// for restricting supported target set are available.
const target = b.standardTargetOptions(.{});
+ // Standard optimization options allow the person running `zig build` to select
+ // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. Here we do not
+ // set a preferred release mode, allowing the user to decide how to optimize.
+ const optimize = b.standardOptimizeOption(.{});
- const lib = addRaylib(b, target);
+ const lib = addRaylib(b, target, optimize);
lib.setOutputDir(srcdir);
lib.install();
}