From c819b5e38b7013373d8f1a5356448f1fccd18ccc Mon Sep 17 00:00:00 2001 From: Purple4pur Date: Mon, 9 Oct 2023 14:46:01 +0800 Subject: [PATCH 1/4] update build.zig for zig 0.11.0 --- examples/build.zig | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/build.zig b/examples/build.zig index 6e13ab3da570..4d079f9dd58e 100644 --- a/examples/build.zig +++ b/examples/build.zig @@ -11,7 +11,7 @@ fn add_module(comptime module: []const u8, b: *std.Build, target: std.zig.CrossT const dir = try std.fs.cwd().openIterableDir(module, .{}); var iter = dir.iterate(); while (try iter.next()) |entry| { - if (entry.kind != .File) continue; + if (entry.kind != .file) continue; const extension_idx = std.mem.lastIndexOf(u8, entry.name, ".c") orelse continue; const name = entry.name[0..extension_idx]; const path = try std.fs.path.join(b.allocator, &.{ module, entry.name }); @@ -24,26 +24,26 @@ fn add_module(comptime module: []const u8, b: *std.Build, target: std.zig.CrossT .target = target, .optimize = optimize, }); - exe.addCSourceFile(path, &[_][]const u8{}); + exe.addCSourceFile(.{ .file = .{ .path = path }, .flags = &.{} }); exe.linkLibC(); exe.addObjectFile(switch (target.getOsTag()) { - .windows => "../src/zig-out/lib/raylib.lib", - .linux => "../src/zig-out/lib/libraylib.a", - .macos => "../src/zig-out/lib/libraylib.a", - .emscripten => "../src/zig-out/lib/libraylib.a", + .windows => .{ .path = "../zig-out/lib/raylib.lib" }, + .linux => .{ .path = "../zig-out/lib/libraylib.a" }, + .macos => .{ .path = "../zig-out/lib/libraylib.a" }, + .emscripten => .{ .path = "../zig-out/lib/libraylib.a" }, else => @panic("Unsupported OS"), }); - exe.addIncludePath("../src"); - exe.addIncludePath("../src/external"); - exe.addIncludePath("../src/external/glfw/include"); + exe.addIncludePath(.{ .path = "../src" }); + exe.addIncludePath(.{ .path = "../src/external" }); + exe.addIncludePath(.{ .path = "../src/external/glfw/include" }); switch (target.getOsTag()) { .windows => { exe.linkSystemLibrary("winmm"); exe.linkSystemLibrary("gdi32"); exe.linkSystemLibrary("opengl32"); - exe.addIncludePath("external/glfw/deps/mingw"); + exe.addIncludePath(.{ .path = "external/glfw/deps/mingw" }); exe.defineCMacro("PLATFORM_DESKTOP", null); }, From 07a2a47ba54cf3c1da99ef3e296c90d402dc02c9 Mon Sep 17 00:00:00 2001 From: Purple4pur Date: Mon, 9 Oct 2023 16:08:02 +0800 Subject: [PATCH 2/4] fix build.zig in examples to install executable correctly --- examples/build.zig | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/examples/build.zig b/examples/build.zig index 4d079f9dd58e..8f16c7510c54 100644 --- a/examples/build.zig +++ b/examples/build.zig @@ -71,11 +71,15 @@ fn add_module(comptime module: []const u8, b: *std.Build, target: std.zig.CrossT }, } - b.installArtifact(exe); - var run = b.addRunArtifact(exe); - run.cwd = module; - b.step(name, name).dependOn(&run.step); - all.dependOn(&exe.step); + const install_cmd = b.addInstallArtifact(exe, .{}); + + const run_cmd = b.addRunArtifact(exe); + run_cmd.step.dependOn(&install_cmd.step); + + const run_step = b.step(name, name); + run_step.dependOn(&run_cmd.step); + + all.dependOn(&install_cmd.step); } return all; } From 18be6d3fbad0db4cb81a9ced28852149d46d1dbb Mon Sep 17 00:00:00 2001 From: Purple4pur Date: Mon, 9 Oct 2023 18:02:55 +0800 Subject: [PATCH 3/4] discard build.zig, only use src/build.zig, to avoid annoying zig-out path problem --- build.zig | 7 ------- examples/build.zig | 8 ++++---- src/build.zig | 8 ++++---- 3 files changed, 8 insertions(+), 15 deletions(-) delete mode 100644 build.zig diff --git a/build.zig b/build.zig deleted file mode 100644 index 12c0513f6a40..000000000000 --- a/build.zig +++ /dev/null @@ -1,7 +0,0 @@ -const std = @import("std"); -const raylib = @import("src/build.zig"); - -// This has been tested to work with zig master branch as of commit 87de821 or May 14 2023 -pub fn build(b: *std.Build) void { - raylib.build(b); -} diff --git a/examples/build.zig b/examples/build.zig index 8f16c7510c54..be4b03869c3e 100644 --- a/examples/build.zig +++ b/examples/build.zig @@ -27,10 +27,10 @@ fn add_module(comptime module: []const u8, b: *std.Build, target: std.zig.CrossT exe.addCSourceFile(.{ .file = .{ .path = path }, .flags = &.{} }); exe.linkLibC(); exe.addObjectFile(switch (target.getOsTag()) { - .windows => .{ .path = "../zig-out/lib/raylib.lib" }, - .linux => .{ .path = "../zig-out/lib/libraylib.a" }, - .macos => .{ .path = "../zig-out/lib/libraylib.a" }, - .emscripten => .{ .path = "../zig-out/lib/libraylib.a" }, + .windows => .{ .path = "../src/zig-out/lib/raylib.lib" }, + .linux => .{ .path = "../src/zig-out/lib/libraylib.a" }, + .macos => .{ .path = "../src/zig-out/lib/libraylib.a" }, + .emscripten => .{ .path = "../src/zig-out/lib/libraylib.a" }, else => @panic("Unsupported OS"), }); diff --git a/src/build.zig b/src/build.zig index 27250f5ff060..d5189822938e 100644 --- a/src/build.zig +++ b/src/build.zig @@ -192,12 +192,12 @@ pub fn build(b: *std.Build) void { const lib = addRaylib(b, target, optimize, options); - lib.installHeader("src/raylib.h", "raylib.h"); - lib.installHeader("src/raymath.h", "raymath.h"); - lib.installHeader("src/rlgl.h", "rlgl.h"); + lib.installHeader("raylib.h", "raylib.h"); + lib.installHeader("raymath.h", "raymath.h"); + lib.installHeader("rlgl.h", "rlgl.h"); if (options.raygui) { - lib.installHeader("../raygui/src/raygui.h", "raygui.h"); + lib.installHeader("../../raygui/src/raygui.h", "raygui.h"); } b.installArtifact(lib); From 105e30ae02422d47610911f6a8cd42b59da20ded Mon Sep 17 00:00:00 2001 From: Purple4pur Date: Mon, 9 Oct 2023 18:09:18 +0800 Subject: [PATCH 4/4] update zig version note --- examples/build.zig | 2 +- src/build.zig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/build.zig b/examples/build.zig index be4b03869c3e..383d9f6517ae 100644 --- a/examples/build.zig +++ b/examples/build.zig @@ -1,7 +1,7 @@ const std = @import("std"); const builtin = @import("builtin"); -// This has been tested to work with zig master branch as of commit 87de821 or May 14 2023 +// This has been tested to work with zig 0.11.0 (67709b6, Aug 4 2023) fn add_module(comptime module: []const u8, b: *std.Build, target: std.zig.CrossTarget, optimize: std.builtin.OptimizeMode) !*std.Build.Step { if (target.getOsTag() == .emscripten) { @panic("Emscripten building via Zig unsupported"); diff --git a/src/build.zig b/src/build.zig index d5189822938e..3bb4f42135b7 100644 --- a/src/build.zig +++ b/src/build.zig @@ -1,6 +1,6 @@ const std = @import("std"); -// This has been tested to work with zig master branch as of commit 87de821 or May 14 2023 +// This has been tested to work with zig 0.11.0 (67709b6, Aug 4 2023) pub fn addRaylib(b: *std.Build, target: std.zig.CrossTarget, optimize: std.builtin.OptimizeMode, options: Options) *std.Build.CompileStep { const raylib_flags = &[_][]const u8{ "-std=gnu99",