From ee5a1c4e34cd59793995c2b7b263053acaefec97 Mon Sep 17 00:00:00 2001 From: Talha Qamar Date: Sun, 14 May 2023 05:07:34 +0500 Subject: [PATCH] Revert "Fixed broken build.zig files. Now works with latest stable compiler (as of commit, latest is 0.10.1) (#3045)" This reverts commit de748dfffefeba1ba9bcf0c90c538d32c9cb2020 so that zig build script works with master branch of zig. --- build.zig | 2 +- src/build.zig | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/build.zig b/build.zig index 042338a6c..2bca6a1d4 100644 --- a/build.zig +++ b/build.zig @@ -1,6 +1,6 @@ const std = @import("std"); const raylib = @import("src/build.zig"); -pub fn build(b: *std.build.Builder) void { +pub fn build(b: *std.Build) void { raylib.build(b); } diff --git a/src/build.zig b/src/build.zig index e4c1e0c44..b39f23ed8 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, target: std.zig.CrossTarget, optimize: std.builtin.OptimizeMode) *std.Build.CompileStep { const raylib_flags = &[_][]const u8{ "-std=gnu99", "-D_GNU_SOURCE", @@ -8,7 +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); + const raylib = b.addStaticLibrary(.{ + .name = "raylib", + .target = target, + .optimize = optimize, + }); raylib.linkLibC(); raylib.addIncludePath(srcdir ++ "/external/glfw/include"); @@ -99,7 +103,7 @@ pub fn addRaylib(b: *std.build.Builder, target: std.zig.CrossTarget) *std.build. return raylib; } -pub fn build(b: *std.build.Builder) void { +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 @@ -108,10 +112,10 @@ pub fn build(b: *std.build.Builder) void { // 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.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); - const lib = addRaylib(b, target); - b.installFile("src/raylib.h", "raylib.h"); + const lib = addRaylib(b, target, optimize); + lib.installHeader("src/raylib.h", "raylib.h"); b.installArtifact(lib); }