summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorstar-tek-mb <[email protected]>2023-05-01 14:02:34 +0500
committerGitHub <[email protected]>2023-05-01 11:02:34 +0200
commited2caa12775da95d3e19ce42dccdca4a0ba8f8a0 (patch)
tree1f4e9b51f4ef28d6c43fc4c83f0fd03431844b05
parent59596e4266aa19692dcf29e3e0c4b3e7ffd50598 (diff)
downloadraylib-ed2caa12775da95d3e19ce42dccdca4a0ba8f8a0.tar.gz
raylib-ed2caa12775da95d3e19ce42dccdca4a0ba8f8a0.zip
fix for latest zig master (#3037)
-rw-r--r--build.zig16
-rw-r--r--examples/build.zig14
-rw-r--r--src/build.zig8
3 files changed, 12 insertions, 26 deletions
diff --git a/build.zig b/build.zig
index 9959d8e0..2bca6a1d 100644
--- a/build.zig
+++ b/build.zig
@@ -2,17 +2,5 @@ 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
+ raylib.build(b);
+}
diff --git a/examples/build.zig b/examples/build.zig
index 65586f12..f94a3b4b 100644
--- a/examples/build.zig
+++ b/examples/build.zig
@@ -26,10 +26,10 @@ fn add_module(comptime module: []const u8, b: *std.Build, target: std.zig.CrossT
exe.addCSourceFile(path, &[_][]const u8{});
exe.linkLibC();
exe.addObjectFile(switch (target.getOsTag()) {
- .windows => "../src/raylib.lib",
- .linux => "../src/libraylib.a",
- .macos => "../src/libraylib.a",
- .emscripten => "../src/libraylib.a",
+ .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",
else => @panic("Unsupported OS"),
});
@@ -70,10 +70,8 @@ fn add_module(comptime module: []const u8, b: *std.Build, target: std.zig.CrossT
},
}
- exe.setOutputDir(module);
-
- var run = exe.run();
- run.step.dependOn(&b.addInstallArtifact(exe).step);
+ b.installArtifact(exe);
+ var run = b.addRunArtifact(exe);
run.cwd = module;
b.step(name, name).dependOn(&run.step);
all.dependOn(&exe.step);
diff --git a/src/build.zig b/src/build.zig
index 84684fef..b39f23ed 100644
--- a/src/build.zig
+++ b/src/build.zig
@@ -90,7 +90,7 @@ pub fn addRaylib(b: *std.Build, target: std.zig.CrossTarget, optimize: std.built
const cache_include = std.fs.path.join(b.allocator, &.{ b.sysroot.?, "cache", "sysroot", "include" }) catch @panic("Out of memory");
defer b.allocator.free(cache_include);
- var dir = std.fs.openDirAbsolute(cache_include, std.fs.Dir.OpenDirOptions{.access_sub_paths = true, .no_follow = true}) catch @panic("No emscripten cache. Generate it!");
+ var dir = std.fs.openDirAbsolute(cache_include, std.fs.Dir.OpenDirOptions{ .access_sub_paths = true, .no_follow = true }) catch @panic("No emscripten cache. Generate it!");
dir.close();
raylib.addIncludePath(cache_include);
@@ -115,11 +115,11 @@ pub fn build(b: *std.Build) void {
const optimize = b.standardOptimizeOption(.{});
const lib = addRaylib(b, target, optimize);
- lib.setOutputDir(srcdir);
- lib.install();
+ lib.installHeader("src/raylib.h", "raylib.h");
+ b.installArtifact(lib);
}
-const srcdir = struct{
+const srcdir = struct {
fn getSrcDir() []const u8 {
return std.fs.path.dirname(@src().file).?;
}