From 32a3accb854f36bea5e45641eb362b85b41cede7 Mon Sep 17 00:00:00 2001 From: przmk Date: Thu, 25 Jul 2024 23:38:44 +0200 Subject: [PATCH] Use local sdl dependency --- build.zig | 4 ++-- build.zig.zon | 11 ++++------- libs/sdl | 1 + 3 files changed, 7 insertions(+), 9 deletions(-) create mode 160000 libs/sdl diff --git a/build.zig b/build.zig index 17b8214..466a919 100644 --- a/build.zig +++ b/build.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const sdl = @import("sdl"); +const sdl = @import("libs/sdl/build.zig"); const vkgen = @import("vulkan_zig"); pub fn build(b: *std.Build) void { @@ -34,7 +34,7 @@ pub fn build(b: *std.Build) void { // SDL2 const sdl_sdk = sdl.init(b, null, null); - sdl_sdk.link(exe, .dynamic, .SDL2); + sdl_sdk.link(exe, .dynamic, sdl.Library.SDL2); exe.root_module.addImport("sdl2", sdl_sdk.getWrapperModuleVulkan(vkzig_bindings)); // zmath diff --git a/build.zig.zon b/build.zig.zon index 911ff6c..5c30a28 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -9,18 +9,15 @@ .url = "https://github.com/Snektron/vulkan-zig/archive/9f6e6177b1fdb3ed22231d9216a24480e84cfa5e.tar.gz", .hash = "1220f2961df224f7d35dee774b26194b8b937cc252fa8e4023407776c58521d53e38", }, - .sdl = .{ - .url = "https://github.com/MasterQ32/SDL.zig/archive/1432ed3f6a020973906fbc996868131ae1d631be.tar.gz", - .hash = "1220ebeeaade31e207a56977aff537a65e6338cddc68d50217ddf30bbc58fb27d367", - }, + // .sdl = .{ + // .url = "https://github.com/ikskuh/SDL.zig/archive/9663dc70c19b13afcb4b9f596c928d7b2838e548.tar.gz", + // .hash = "12202141beb92d68ef5088538ff761d5c3ecd2d4e11867c89fbbdcd9f814b8cba8ee", + // }, }, .paths = .{ "build.zig", "build.zig.zon", "src", - // For example... - //"LICENSE", - //"README.md", }, } diff --git a/libs/sdl b/libs/sdl new file mode 160000 index 0000000..9663dc7 --- /dev/null +++ b/libs/sdl @@ -0,0 +1 @@ +Subproject commit 9663dc70c19b13afcb4b9f596c928d7b2838e548