diff --git a/build.zig.zon b/build.zig.zon index 6ee770a9c..812b765d6 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -19,23 +19,23 @@ }, .zaudio = .{ - .url = "https://github.com/zig-gamedev/zaudio/archive/1012b105627e28827f558b79e533575ef65a4965.tar.gz", + .url = "https://github.com/zig-gamedev/zaudio/archive/ea4200e7e9a877953ecb3fe8aa18a0d0d58a4bc2.tar.gz", .hash = "zaudio-0.11.0-dev-_M-91mJkPwB7NWGKgDvdpl3xyjkk301Tp6ubbsleUvVK", }, .zbullet = .{ - .url = "https://github.com/zig-gamedev/zbullet/archive/9a686d95f5e05cd6bb4a1f34fd59ee8e7ee2cc9d.tar.gz", - .hash = "zbullet-0.4.0-dev-7gkXj7GUQAAkp5CZT20veGkT9f0f8Qeloh6ok4dv1bSs", + .url = "https://github.com/zig-gamedev/zbullet/archive/092c2abc9bbc3bd31ff72d85e2c9aef36c47d4a5.tar.gz", + .hash = "zbullet-0.4.0-dev-7gkXjwigQADRKxxk65Tg5J4hbQ4dfRxfvScjso6XyhRF", }, .zflecs = .{ - .url = "https://github.com/zig-gamedev/zflecs/archive/34f6cc3f6d11fa13a44ae759e9ed6bec3a455fa4.tar.gz", - .hash = "zflecs-0.2.0-dev-1PN3yuhMNQDj3J57z74E3AIGM8bmVg3FhAd6XZKb_A9W", + .url = "https://github.com/zig-gamedev/zflecs/archive/4294dd32d898b786388d2412843e96c67ed273d4.tar.gz", + .hash = "zflecs-0.2.0-dev-1PN3yq5gNgAlzG5i6NiSb7bWe17F3_pW0TO75vTUYWEr", }, .zemscripten = .{ - .url = "https://github.com/zig-gamedev/zemscripten/archive/e82dfa1183171d6e56af80c3a6ec13c119231f7a.tar.gz", - .hash = "zemscripten-0.2.0-dev-sRlDqLZNAAAzyv87o5wdKaX11asXJIxJwJJt1NHoDDsa", + .url = "https://github.com/zig-gamedev/zemscripten/archive/97eb64f422a110a813f298585acbfb604f7fe08c.tar.gz", + .hash = "zemscripten-0.2.0-dev-sRlDqLZNAABqYJZMdZSczedrT29D5Wu2t5kLci0yd9uU", }, .emsdk = .{ .url = "https://github.com/emscripten-core/emsdk/archive/refs/tags/4.0.3.tar.gz", @@ -43,8 +43,8 @@ }, .zglfw = .{ - .url = "https://github.com/zig-gamedev/zglfw/archive/c337cb3d3f984468ea7a386335937a5d555fc024.tar.gz", - .hash = "zglfw-0.10.0-dev-zgVDNMacIQA-k7kNSfwUc9Lfzx-bb_wklVm25K-p8Tr7", + .url = "https://github.com/zig-gamedev/zglfw/archive/feeeff9386dd44ba2c18488113023865c41b80a4.tar.gz", + .hash = "zglfw-0.10.0-dev-zgVDNLyhIQCZR_rbIf7hnCKuifzcmPOLOQhd_hrqq8cl", }, .zgpu = .{ @@ -78,8 +78,8 @@ }, .zgui = .{ - .url = "https://github.com/zig-gamedev/zgui/archive/b1c775da1f14d9dbeadc22243a11f7342bf59a51.tar.gz", - .hash = "zgui-0.6.0-dev--L6sZC-1aADzgrip50BHiYDaCwSMC04XWK0epNlQD6Dt", + .url = "https://github.com/zig-gamedev/zgui/archive/068c56384d756d9e955b779a4b96a157025b84ef.tar.gz", + .hash = "zgui-0.6.0-dev--L6sZCJ_aQDN8-3-W-__lzfAk3xpqNO7ZpsD_gi_REpb", }, .zjobs = .{ @@ -103,8 +103,8 @@ }, .zopengl = .{ - .url = "https://github.com/zig-gamedev/zopengl/archive/27f5f228bc1f6da4a4f6acaca07d1cc5ad135171.tar.gz", - .hash = "zopengl-0.6.0-dev-5-tnz59jCAB6WpFFql6YdVtwBLlOcReCYVOnxQTPD-xC", + .url = "https://github.com/zig-gamedev/zopengl/archive/33ae578d91692c814e7d6b4b42573142475f68d0.tar.gz", + .hash = "zopengl-0.6.0-dev-5-tnz7Y8CQCW_JRgxPCM4ETsKGOGHddqw5y1XaXhrsb4", }, .zopenvr = .{ @@ -113,8 +113,8 @@ }, .zphysics = .{ - .url = "https://github.com/zig-gamedev/zphysics/archive/cfa94645fd2151507eee481021e230722ad77fd7.tar.gz", - .hash = "zphysics-0.2.0-dev-nZDEABi7QgBUjk6YPWeNooglZGj8rintJdSTSE_bPkQm", + .url = "https://github.com/zig-gamedev/zphysics/archive/909f73068b6808e252c89c912aa70bc28c29dc27.tar.gz", + .hash = "zphysics-0.2.0-dev-nZDEAC27QgCtjY5yM0zkX06l_7rJurf2xb1zzCPxnDvi", }, .zpix = .{ @@ -128,23 +128,8 @@ }, .zsdl = .{ - .url = "https://github.com/zig-gamedev/zsdl/archive/89c1fe2d7ef5020c68e71ac574195f09fc949cce.tar.gz", - .hash = "zsdl-0.4.0-dev-rFpjE5FXWQAHcbsSHDjFtbTkruSgvRVYOae6x8RXCnoM", - }, - .sdl2_prebuilt_macos = .{ - .url = "https://github.com/zig-gamedev/sdl2-prebuilt-macos/archive/7bc0fa9101342c019eed252d43f490660dfa411b.tar.gz", - .hash = "sdl2_prebuilt_macos-0.2.0-dev-DaOxP5Eq2QBpNBkpXn2qjyI6_s0gINcbdUMpqI1KshaH", - .lazy = true, - }, - .sdl2_prebuilt_x86_64_windows_gnu = .{ - .url = "https://github.com/zig-gamedev/sdl2-prebuilt-x86_64-windows-gnu/archive/8de1512cedfa1fb3ab17ecf295af8cabd7f231f1.tar.gz", - .hash = "sdl2_prebuilt_x86_64_windows_gnu-0.2.0-dev-HPeIhv2VaQBOWF4Fjtr7Vb9bA852pUtwUuQKdvNvkA98", - .lazy = true, - }, - .sdl2_prebuilt_x86_64_linux_gnu = .{ - .url = "https://github.com/zig-gamedev/sdl2-prebuilt-x86_64-linux-gnu/archive/ce2b511c052c3fdc35c286ade8235d2830a50992.tar.gz", - .hash = "sdl2_prebuilt_x86_64_linux_gnu-0.2.0-dev-NHZ_xrzSHwDJDoAxuVi000OEq428znS1fDRRJE8PlXHu", - .lazy = true, + .url = "https://github.com/zig-gamedev/zsdl/archive/a764b0ee51a157a6133007e4f423a869df9e31d7.tar.gz", + .hash = "zsdl-0.4.0-dev-rFpjE2BgWQADibKkkIjv0Ig8k96MOu3Yeo6e0n9OD85L", }, .sdl3_prebuilt_macos = .{ .url = "https://github.com/zig-gamedev/sdl3-prebuilt-macos/archive/e89207914a0f0163c0fb543da4f530f645ef5969.tar.gz", @@ -161,6 +146,21 @@ .hash = "sdl3_prebuilt_x86_64_linux_gnu-0.2.0-dev-qpwWsmyVNwBHzXjgC9Z-U02SXoUVMMxvCnI7XKocDcDn", .lazy = true, }, + .sdl2_prebuilt_macos = .{ + .url = "https://github.com/zig-gamedev/sdl2-prebuilt-macos/archive/7bc0fa9101342c019eed252d43f490660dfa411b.tar.gz", + .hash = "sdl2_prebuilt_macos-0.2.0-dev-DaOxP5Eq2QBpNBkpXn2qjyI6_s0gINcbdUMpqI1KshaH", + .lazy = true, + }, + .sdl2_prebuilt_x86_64_windows_gnu = .{ + .url = "https://github.com/zig-gamedev/sdl2-prebuilt-x86_64-windows-gnu/archive/8de1512cedfa1fb3ab17ecf295af8cabd7f231f1.tar.gz", + .hash = "sdl2_prebuilt_x86_64_windows_gnu-0.2.0-dev-HPeIhv2VaQBOWF4Fjtr7Vb9bA852pUtwUuQKdvNvkA98", + .lazy = true, + }, + .sdl2_prebuilt_x86_64_linux_gnu = .{ + .url = "https://github.com/zig-gamedev/sdl2-prebuilt-x86_64-linux-gnu/archive/ce2b511c052c3fdc35c286ade8235d2830a50992.tar.gz", + .hash = "sdl2_prebuilt_x86_64_linux_gnu-0.2.0-dev-NHZ_xrzSHwDJDoAxuVi000OEq428znS1fDRRJE8PlXHu", + .lazy = true, + }, .zstbi = .{ .url = "https://github.com/zig-gamedev/zstbi/archive/094c4bba5cdbec167d3f6aaa98cccccd5c99145f.tar.gz", diff --git a/experiments/genart/build.zig b/experiments/genart/build.zig index 159fe0ca6..bc6f9f377 100644 --- a/experiments/genart/build.zig +++ b/experiments/genart/build.zig @@ -75,8 +75,28 @@ fn install( exe.root_module.addImport("zsdl2", zsdl2_module); - @import("zsdl").link_SDL2(exe); @import("zsdl").prebuilt_sdl2.addLibraryPathsTo(exe); + switch (exe.rootModuleTarget().os.tag) { + .windows => { + exe.linkSystemLibrary("SDL2"); + exe.linkSystemLibrary("SDL2main"); + exe.linkSystemLibrary("SDL2_ttf"); + exe.linkSystemLibrary("SDL2_image"); + }, + .linux => { + exe.linkSystemLibrary("SDL2"); + exe.linkSystemLibrary("SDL2_ttf"); + exe.linkSystemLibrary("SDL2_image"); + exe.root_module.addRPathSpecial("$ORIGIN"); + }, + .macos => { + exe.linkFramework("SDL2"); + exe.linkFramework("SDL2_ttf"); + exe.linkFramework("SDL2_image"); + exe.root_module.addRPathSpecial("@executable_path"); + }, + else => {}, + } exe.root_module.addImport("zopengl", zopengl_module); diff --git a/libs/zaudio b/libs/zaudio index 1012b1056..ea4200e7e 160000 --- a/libs/zaudio +++ b/libs/zaudio @@ -1 +1 @@ -Subproject commit 1012b105627e28827f558b79e533575ef65a4965 +Subproject commit ea4200e7e9a877953ecb3fe8aa18a0d0d58a4bc2 diff --git a/libs/zbullet b/libs/zbullet index 9a686d95f..092c2abc9 160000 --- a/libs/zbullet +++ b/libs/zbullet @@ -1 +1 @@ -Subproject commit 9a686d95f5e05cd6bb4a1f34fd59ee8e7ee2cc9d +Subproject commit 092c2abc9bbc3bd31ff72d85e2c9aef36c47d4a5 diff --git a/libs/zemscripten b/libs/zemscripten index e82dfa118..97eb64f42 160000 --- a/libs/zemscripten +++ b/libs/zemscripten @@ -1 +1 @@ -Subproject commit e82dfa1183171d6e56af80c3a6ec13c119231f7a +Subproject commit 97eb64f422a110a813f298585acbfb604f7fe08c diff --git a/libs/zflecs b/libs/zflecs index 34f6cc3f6..4294dd32d 160000 --- a/libs/zflecs +++ b/libs/zflecs @@ -1 +1 @@ -Subproject commit 34f6cc3f6d11fa13a44ae759e9ed6bec3a455fa4 +Subproject commit 4294dd32d898b786388d2412843e96c67ed273d4 diff --git a/libs/zglfw b/libs/zglfw index c337cb3d3..feeeff938 160000 --- a/libs/zglfw +++ b/libs/zglfw @@ -1 +1 @@ -Subproject commit c337cb3d3f984468ea7a386335937a5d555fc024 +Subproject commit feeeff9386dd44ba2c18488113023865c41b80a4 diff --git a/libs/zgui b/libs/zgui index b1c775da1..068c56384 160000 --- a/libs/zgui +++ b/libs/zgui @@ -1 +1 @@ -Subproject commit b1c775da1f14d9dbeadc22243a11f7342bf59a51 +Subproject commit 068c56384d756d9e955b779a4b96a157025b84ef diff --git a/libs/zopengl b/libs/zopengl index 27f5f228b..33ae578d9 160000 --- a/libs/zopengl +++ b/libs/zopengl @@ -1 +1 @@ -Subproject commit 27f5f228bc1f6da4a4f6acaca07d1cc5ad135171 +Subproject commit 33ae578d91692c814e7d6b4b42573142475f68d0 diff --git a/libs/zphysics b/libs/zphysics index cfa94645f..909f73068 160000 --- a/libs/zphysics +++ b/libs/zphysics @@ -1 +1 @@ -Subproject commit cfa94645fd2151507eee481021e230722ad77fd7 +Subproject commit 909f73068b6808e252c89c912aa70bc28c29dc27 diff --git a/libs/zsdl b/libs/zsdl index 89c1fe2d7..a764b0ee5 160000 --- a/libs/zsdl +++ b/libs/zsdl @@ -1 +1 @@ -Subproject commit 89c1fe2d7ef5020c68e71ac574195f09fc949cce +Subproject commit a764b0ee51a157a6133007e4f423a869df9e31d7 diff --git a/samples/minimal_sdl_gl/build.zig b/samples/minimal_sdl_gl/build.zig index cef3186bb..709e3cb4b 100644 --- a/samples/minimal_sdl_gl/build.zig +++ b/samples/minimal_sdl_gl/build.zig @@ -17,7 +17,27 @@ pub fn build(b: *std.Build, options: anytype) *std.Build.Step.Compile { exe.root_module.addImport("zsdl2", zsdl.module("zsdl2")); @import("zsdl").prebuilt_sdl2.addLibraryPathsTo(exe); - @import("zsdl").link_SDL2(exe); + switch (exe.rootModuleTarget().os.tag) { + .windows => { + exe.linkSystemLibrary("SDL2"); + exe.linkSystemLibrary("SDL2main"); + exe.linkSystemLibrary("SDL2_ttf"); + exe.linkSystemLibrary("SDL2_image"); + }, + .linux => { + exe.linkSystemLibrary("SDL2"); + exe.linkSystemLibrary("SDL2_ttf"); + exe.linkSystemLibrary("SDL2_image"); + exe.root_module.addRPathSpecial("$ORIGIN"); + }, + .macos => { + exe.linkFramework("SDL2"); + exe.linkFramework("SDL2_ttf"); + exe.linkFramework("SDL2_image"); + exe.root_module.addRPathSpecial("@executable_path"); + }, + else => {}, + } const zopengl = b.dependency("zopengl", .{}); exe.root_module.addImport("zopengl", zopengl.module("root")); diff --git a/samples/monolith/src/monolith.zig b/samples/monolith/src/monolith.zig index e8fd09f62..8c3d89a6b 100644 --- a/samples/monolith/src/monolith.zig +++ b/samples/monolith/src/monolith.zig @@ -597,7 +597,7 @@ const DebugRenderer = struct { pub fn destroyTriangleBatch( _: *DebugRenderer, - _: *zphy.DebugRenderer.TriangleBatch, + _: *anyopaque, ) callconv(.c) void {} }; diff --git a/samples/sdl2_demo/build.zig b/samples/sdl2_demo/build.zig index 126f2bc8f..d0a8144d1 100644 --- a/samples/sdl2_demo/build.zig +++ b/samples/sdl2_demo/build.zig @@ -24,9 +24,27 @@ pub fn build(b: *std.Build, options: anytype) *std.Build.Step.Compile { exe.root_module.addImport("zsdl2_image", zsdl.module("zsdl2_image")); @import("zsdl").prebuilt_sdl2.addLibraryPathsTo(exe); - - @import("zsdl").link_SDL2(exe); - @import("zsdl").link_SDL2_image(exe); + switch (exe.rootModuleTarget().os.tag) { + .windows => { + exe.linkSystemLibrary("SDL2"); + exe.linkSystemLibrary("SDL2main"); + exe.linkSystemLibrary("SDL2_ttf"); + exe.linkSystemLibrary("SDL2_image"); + }, + .linux => { + exe.linkSystemLibrary("SDL2"); + exe.linkSystemLibrary("SDL2_ttf"); + exe.linkSystemLibrary("SDL2_image"); + exe.root_module.addRPathSpecial("$ORIGIN"); + }, + .macos => { + exe.linkFramework("SDL2"); + exe.linkFramework("SDL2_ttf"); + exe.linkFramework("SDL2_image"); + exe.root_module.addRPathSpecial("@executable_path"); + }, + else => {}, + } const install_content_step = b.addInstallDirectory(.{ .source_dir = b.path(b.pathJoin(&.{ cwd_path, content_dir })),