UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix for latest zig master (#3037)

Browse source
This commit is contained in:
star-tek-mb 2023-05-01 14:02:34 +05:00 • committed by GitHub
parent 59596e4266
commit ed2caa1277
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

14
build.zig
View file

@ -2,17 +2,5 @@ const std = @import("std");
const raylib = @import("src/build.zig"); const raylib = @import("src/build.zig");
pub fn build(b: *std.Build) void { pub fn build(b: *std.Build) void {
// Standard target options allows the person running `zig build` to choose raylib.build(b);
// 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();
} }

14
examples/build.zig
View file

@ -26,10 +26,10 @@ fn add_module(comptime module: []const u8, b: *std.Build, target: std.zig.CrossT
exe.addCSourceFile(path, &[_][]const u8{}); exe.addCSourceFile(path, &[_][]const u8{});
exe.linkLibC(); exe.linkLibC();
exe.addObjectFile(switch (target.getOsTag()) { exe.addObjectFile(switch (target.getOsTag()) {
.windows => "../src/raylib.lib", .windows => "../src/zig-out/lib/raylib.lib",
.linux => "../src/libraylib.a", .linux => "../src/zig-out/lib/libraylib.a",
.macos => "../src/libraylib.a", .macos => "../src/zig-out/lib/libraylib.a",
.emscripten => "../src/libraylib.a", .emscripten => "../src/zig-out/lib/libraylib.a",
else => @panic("Unsupported OS"), 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); b.installArtifact(exe);
var run = b.addRunArtifact(exe);
var run = exe.run();
run.step.dependOn(&b.addInstallArtifact(exe).step);
run.cwd = module; run.cwd = module;
b.step(name, name).dependOn(&run.step); b.step(name, name).dependOn(&run.step);
all.dependOn(&exe.step); all.dependOn(&exe.step);

4
src/build.zig
View file

@ -115,8 +115,8 @@ pub fn build(b: *std.Build) void {
const optimize = b.standardOptimizeOption(.{}); const optimize = b.standardOptimizeOption(.{});
const lib = addRaylib(b, target, optimize); const lib = addRaylib(b, target, optimize);
lib.setOutputDir(srcdir); lib.installHeader("src/raylib.h", "raylib.h");
lib.install(); b.installArtifact(lib);
} }
const srcdir = struct { const srcdir = struct {