Merge pull request #513 from Pyrolistical/zsdl-use-cwd-over-rpath-on-windows

hazeycode · web-flow · commit e3dc04fd160a · 2024-03-02T23:50:53.000Z
[zsdl] handle windows case for #467 by setting cwd instead of rpath
diff --git a/build.zig b/build.zig
@@ -269,9 +269,9 @@ fn tests(
     test_step.dependOn(zphysics.runTests(b, optimize, target));
     test_step.dependOn(zpool.runTests(b, optimize, target));
 
-    // TODO(hazeycode): Fix tests linking SDL on Windows and macOS
+    // TODO(hazeycode): Fix tests linking SDL on macOS
     switch (target.result.os.tag) {
-        .windows, .macos => {},
+        .macos => {},
         else => test_step.dependOn(zsdl.runTests(b, optimize, target)),
     }
 
diff --git a/libs/zsdl/build.zig b/libs/zsdl/build.zig
@@ -212,6 +212,12 @@ pub fn build(b: *std.Build) void {
     const test_step = b.step("test", "Run zsdl tests");
     test_step.dependOn(runTests(b, optimize, target));
 
+    const version_check_step = b.step("version-check", "checks runtime library version is the same as the compiled version");
+    version_check_step.dependOn(testStep("src/sdl2_version_check.zig", b, "zsdl-sdl2-version-check", target, optimize, .{
+        .api_version = .sdl2,
+        .enable_ttf = true,
+    }));
+
     _ = package(b, target, optimize, .{
         .options = .{
             .api_version = b.option(ApiVersion, "api_version", "Select an SDL API version") orelse .sdl2,
@@ -227,13 +233,13 @@ pub fn runTests(
     const step = b.allocator.create(std.Build.Step) catch @panic("OOM");
     step.* = std.Build.Step.init(.{ .id = .custom, .name = "zsdl-tests", .owner = b });
 
-    step.dependOn(testStep(b, "zsdl-tests-sdl2", target, optimize, .{
+    step.dependOn(testStep("src/zsdl.zig", b, "zsdl-tests-sdl2", target, optimize, .{
         .api_version = .sdl2,
         .enable_ttf = true,
     }));
 
     // TODO: link SDL3 libs on all platforms
-    // step.dependOn(testStep(b, "zsdl-tests-sdl3", target, optimize, .{
+    // step.dependOn(testStep("src/zsdl.zig", b, "zsdl-tests-sdl3", target, optimize, .{
     //     .api_version = .sdl3,
     //     .enable_ttf = true,
     // }));
@@ -242,6 +248,7 @@ pub fn runTests(
 }
 
 fn testStep(
+    comptime test_entry: []const u8,
     b: *std.Build,
     name: []const u8,
     target: std.Build.ResolvedTarget,
@@ -250,14 +257,22 @@ fn testStep(
 ) *std.Build.Step {
     const tests = b.addTest(.{
         .name = name,
-        .root_source_file = .{ .path = thisDir() ++ "/src/zsdl.zig" },
+        .root_source_file = .{ .path = thisDir() ++ "/" ++ test_entry },
         .target = target,
         .optimize = optimize,
     });
     const pkg = package(b, target, optimize, .{ .options = options });
     pkg.link(tests);
-    tests.addRPath(.{ .path = b.getInstallPath(.bin, "") });
-    return &b.addRunArtifact(tests).step;
+    var test_run = b.addRunArtifact(tests);
+    switch (target.result.os.tag) {
+        .windows => test_run.setCwd(.{
+            .path = b.getInstallPath(.bin, ""),
+        }),
+        else => tests.addRPath(.{
+            .path = b.getInstallPath(.bin, ""),
+        }),
+    }
+    return &test_run.step;
 }
 
 inline fn thisDir() []const u8 {
diff --git a/libs/zsdl/src/sdl2_version_check.zig b/libs/zsdl/src/sdl2_version_check.zig
@@ -0,0 +1,6 @@
+const std = @import("std");
+const sdl2 = @import("sdl2.zig");
+
+test "compiled version should be same as linked version" {
+    try std.testing.expectEqual(sdl2.VERSION, sdl2.getVersion());
+}
