@@ -80,30 +80,35 @@ fn current_file() []const u8 {
80
80
return @src ().file ;
81
81
}
82
82
83
- const cwd = std .fs .path .dirname (current_file ()).? ;
84
83
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" ;
86
86
87
87
const raylib_build = @import ("raylib/src/build.zig" );
88
88
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 });
91
91
lib .addIncludePath (.{ .path = dir_raylib });
92
92
lib .addIncludePath (.{ .path = cwd });
93
93
lib .linkLibC ();
94
94
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 });
95
97
return lib ;
96
98
}
97
99
98
100
/// 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 });
101
105
exe .addIncludePath (.{ .path = dir_raylib });
102
106
exe .addIncludePath (.{ .path = cwd });
103
107
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 } );
105
109
exe .linkLibrary (lib_raylib );
106
110
exe .linkLibrary (lib );
111
+ std .log .info ("linked raylib.zig" , .{});
107
112
}
108
113
109
114
pub fn linkSystemDependencies (exe : * std.build.Step.Compile ) void {
0 commit comments