Update zsdl (#744)

hazeycode · web-flow · commit 4bc95e9ad966 · 2025-02-23T22:51:14.000Z
diff --git a/build.zig b/build.zig
@@ -81,6 +81,14 @@ pub fn build(b: *std.Build) void {
         }
     }
 
+    // Install prebuilt SDL2 libs in bin output dir
+    if (@import("zsdl").prebuilt_sdl2.install(b, options.target.result, .bin, .{
+        .ttf = true,
+        .image = true,
+    })) |install_sdl2_step| {
+        b.getInstallStep().dependOn(install_sdl2_step);
+    }
+
     { // Benchmarks
         const benchmark_step = b.step("benchmark", "Run all benchmarks");
         const zmath = b.dependency("zmath", .{
diff --git a/build.zig.zon b/build.zig.zon
@@ -127,8 +127,8 @@
         },
 
         .zsdl = .{
-            .url = "https://github.com/zig-gamedev/zsdl/archive/48a230277225fd8e731fe6bedd1b543d54c94d8a.tar.gz",
-            .hash = "1220d5669fa5c68b1de8e27bf1f71cd4d3adc0e1f9de7ef9ec50644468596822f3ea",
+            .url = "https://github.com/zig-gamedev/zsdl/archive/9635e2f996e86cd46ce939752b7a8c47f9883b9e.tar.gz",
+            .hash = "1220a5251c77af0d18c54ab1754fb0a296b9e4894b544b365c3e3da3c661b3b6f2aa",
         },
         .@"sdl2-prebuilt-macos" = .{
             .url = "https://github.com/zig-gamedev/sdl2-prebuilt-macos/archive/f14773fa3de719b3a399b854c31eb4139d63842f.tar.gz",
diff --git a/experiments/genart/build.zig b/experiments/genart/build.zig
@@ -76,7 +76,7 @@ fn install(
     exe.root_module.addImport("zsdl2", zsdl2_module);
 
     @import("zsdl").link_SDL2(exe);
-    @import("zsdl").prebuilt.addLibraryPathsTo(exe);
+    @import("zsdl").prebuilt_sdl2.addLibraryPathsTo(exe);
 
     exe.root_module.addImport("zopengl", zopengl_module);
 
@@ -86,10 +86,6 @@ fn install(
     );
     install_step.dependOn(&b.addInstallArtifact(exe, .{}).step);
 
-    if (@import("zsdl").prebuilt.install_SDL2(b, target.result, .bin)) |install_sdl2_step| {
-        install_step.dependOn(install_sdl2_step);
-    }
-
     const run_step = b.step(
         name ++ "-run",
         "Run '" ++ desc_name[0..desc_size] ++ "' genart experiment",
diff --git a/libs/zsdl b/libs/zsdl
@@ -1 +1 @@
-Subproject commit d03b4d4e7cb7a74e01d9dad30d0f1692286f58f8
+Subproject commit 9635e2f996e86cd46ce939752b7a8c47f9883b9e
diff --git a/samples/minimal_sdl_gl/build.zig b/samples/minimal_sdl_gl/build.zig
@@ -16,12 +16,7 @@ pub fn build(b: *std.Build, options: anytype) *std.Build.Step.Compile {
     const zsdl = b.dependency("zsdl", .{});
     exe.root_module.addImport("zsdl2", zsdl.module("zsdl2"));
 
-    @import("zsdl").prebuilt.addLibraryPathsTo(exe);
-
-    if (@import("zsdl").prebuilt.install_SDL2(b, options.target.result, .bin)) |install_sdl2_step| {
-        exe.step.dependOn(install_sdl2_step);
-    }
-
+    @import("zsdl").prebuilt_sdl2.addLibraryPathsTo(exe);
     @import("zsdl").link_SDL2(exe);
 
     const zopengl = b.dependency("zopengl", .{});
diff --git a/samples/sdl2_demo/build.zig b/samples/sdl2_demo/build.zig
@@ -23,15 +23,7 @@ pub fn build(b: *std.Build, options: anytype) *std.Build.Step.Compile {
     exe.root_module.addImport("zsdl2", zsdl.module("zsdl2"));
     exe.root_module.addImport("zsdl2_image", zsdl.module("zsdl2_image"));
 
-    @import("zsdl").prebuilt.addLibraryPathsTo(exe);
-
-    if (@import("zsdl").prebuilt.install_SDL2(b, options.target.result, .bin)) |install_lib_step| {
-        exe.step.dependOn(install_lib_step);
-    }
-
-    if (@import("zsdl").prebuilt.install_SDL2_image(b, options.target.result, .bin)) |install_lib_step| {
-        exe.step.dependOn(install_lib_step);
-    }
+    @import("zsdl").prebuilt_sdl2.addLibraryPathsTo(exe);
 
     @import("zsdl").link_SDL2(exe);
     @import("zsdl").link_SDL2_image(exe);

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,14 @@ pub fn build(b: *std.Build) void {`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`
	`84`	`+ // Install prebuilt SDL2 libs in bin output dir`
	`85`	`+ if (@import("zsdl").prebuilt_sdl2.install(b, options.target.result, .bin, .{`
	`86`	`+ .ttf = true,`
	`87`	`+ .image = true,`
	`88`	`+ })) \|install_sdl2_step\| {`
	`89`	`+ b.getInstallStep().dependOn(install_sdl2_step);`
	`90`	`+ }`
	`91`	`+`
`84`	`92`	`{ // Benchmarks`
`85`	`93`	`const benchmark_step = b.step("benchmark", "Run all benchmarks");`
`86`	`94`	`const zmath = b.dependency("zmath", .{`