diff options
| author | Purple4pur <[email protected]> | 2023-10-14 01:55:52 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-10-13 19:55:52 +0200 |
| commit | 4981acb241d18afc4d0db3497ecbe37d1f31808e (patch) | |
| tree | b06d941d9a2463e870cc45a8a6d0d9ca3e4f979f | |
| parent | 5a0d9c8d43d212892e421e1cbb532fea508d8692 (diff) | |
| download | raylib-4981acb241d18afc4d0db3497ecbe37d1f31808e.tar.gz raylib-4981acb241d18afc4d0db3497ecbe37d1f31808e.zip | |
fix zig syntax errors in examples, and make it install executables correctly (#3395)
| -rw-r--r-- | build.zig | 2 | ||||
| -rw-r--r-- | examples/build.zig | 36 | ||||
| -rw-r--r-- | src/build.zig | 2 |
3 files changed, 22 insertions, 18 deletions
@@ -1,7 +1,7 @@ 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 +// This has been tested to work with zig 0.11.0 (67709b6, Aug 4 2023) pub fn build(b: *std.Build) void { raylib.build(b); } diff --git a/examples/build.zig b/examples/build.zig index 6e13ab3d..94ecc678 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"); @@ -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); }, @@ -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; } diff --git a/src/build.zig b/src/build.zig index 27250f5f..53e07424 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", |
