Skip to content

Commit bd561b3

Browse files
committed
update bindings to match 40f3df5b865eee0cd87a9e4e1347cb04c87841f8
1 parent b074759 commit bd561b3

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

build.zig

+12-7
Original file line numberDiff line numberDiff line change
@@ -80,30 +80,35 @@ fn current_file() []const u8 {
8080
return @src().file;
8181
}
8282

83-
const cwd = std.fs.path.dirname(current_file()).?;
8483
const sep = std.fs.path.sep_str;
85-
const dir_raylib = cwd ++ sep ++ "raylib/src";
84+
const cwd = std.fs.path.dirname(current_file()).?;
85+
const dir_raylib = cwd ++ sep ++ "raylib" ++ sep ++ "src";
8686

8787
const raylib_build = @import("raylib/src/build.zig");
8888

89-
fn linkThisLibrary(b: *std.Build, target: std.zig.CrossTarget, optimize: std.builtin.Mode) *std.build.LibExeObjStep {
90-
const lib = b.addStaticLibrary(.{ .name = "raylib-zig", .target = target, .optimize = optimize });
89+
fn linkThisLibrary(b: *std.Build, target: std.Target.Query, optimize: std.builtin.Mode) *std.Build.Step.Compile {
90+
const lib = b.addStaticLibrary(.{ .name = "raylib.zig", .target = b.resolveTargetQuery(target), .optimize = optimize });
9191
lib.addIncludePath(.{ .path = dir_raylib });
9292
lib.addIncludePath(.{ .path = cwd });
9393
lib.linkLibC();
9494
lib.addCSourceFile(.{ .file = .{ .path = cwd ++ sep ++ "marshal.c" }, .flags = &.{} });
95+
std.log.info("include '{s}' to {s}", .{ dir_raylib, lib.name });
96+
std.log.info("include '{s}' to {s}", .{ cwd, lib.name });
9597
return lib;
9698
}
9799

98100
/// add this package to exe
99-
pub fn addTo(b: *std.Build, exe: *std.build.Step.Compile, target: std.zig.CrossTarget, optimize: std.builtin.Mode, raylibOptions: raylib_build.Options) void {
100-
exe.addAnonymousModule("raylib", .{ .source_file = .{ .path = cwd ++ sep ++ "raylib.zig" } });
101+
pub fn addTo(b: *std.Build, exe: *std.Build.Step.Compile, target: std.Target.Query, optimize: std.builtin.Mode, raylibOptions: raylib_build.Options) void {
102+
exe.root_module.addAnonymousImport("raylib", .{ .root_source_file = .{ .path = cwd ++ sep ++ "raylib.zig" } });
103+
std.log.info("include '{s}' to {s}", .{ dir_raylib, exe.name });
104+
std.log.info("include '{s}' to {s}", .{ cwd, exe.name });
101105
exe.addIncludePath(.{ .path = dir_raylib });
102106
exe.addIncludePath(.{ .path = cwd });
103107
const lib = linkThisLibrary(b, target, optimize);
104-
const lib_raylib = raylib_build.addRaylib(b, target, optimize, raylibOptions);
108+
const lib_raylib = raylib_build.addRaylib(b, b.resolveTargetQuery(target), optimize, raylibOptions) catch |err| std.debug.panic("addRaylib: {any}", .{err});
105109
exe.linkLibrary(lib_raylib);
106110
exe.linkLibrary(lib);
111+
std.log.info("linked raylib.zig", .{});
107112
}
108113

109114
pub fn linkSystemDependencies(exe: *std.build.Step.Compile) void {

0 commit comments

Comments
 (0)