Skip to content
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

Jump to bottom

Update zig build system to zig version 0.11.0 #3393

Merged
merged 4 commits into from
Oct 9, 2023
Merged

Update zig build system to zig version 0.11.0 #3393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c819b5e
update build.zig for zig 0.11.0
purple4pur Oct 9, 2023
07a2a47
fix build.zig in examples to install executable correctly
purple4pur Oct 9, 2023
18be6d3
discard build.zig, only use src/build.zig, to avoid annoying zig-out …
purple4pur Oct 9, 2023
105e30a
update zig version note
purple4pur Oct 9, 2023
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
7 changes: 0 additions & 7 deletions build.zig
View file
Open in desktop

This file was deleted.

36 changes: 20 additions & 16 deletions examples/build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
Expand All @@ -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 });
Expand All @@ -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 = "../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"),
});

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);
},
Expand Down Expand Up @@ -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;
}
Expand Down
10 changes: 5 additions & 5 deletions src/build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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);
Expand Down