From e96e932ca2e6934da76592ebc3fb96657765ab43 Mon Sep 17 00:00:00 2001 From: Speedy_Lex <78314533+speedy-lex@users.noreply.github.com> Date: Thu, 3 Jul 2025 14:31:25 +0200 Subject: [PATCH] raylib submodule -> zig dependency --- .gitmodules | 3 --- build.zig | 12 +++--------- build.zig.zon | 13 +++++++++++++ foreign/raylib | 1 - 4 files changed, 16 insertions(+), 13 deletions(-) create mode 100644 build.zig.zon delete mode 160000 foreign/raylib diff --git a/.gitmodules b/.gitmodules index 6af15de..4b7cc6b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,6 +10,3 @@ path = foreign/lua54 url = https://github.com/lua/lua branch = v5.4 -[submodule "foreign/raylib"] - path = foreign/raylib - url = https://github.com/raysan5/raylib diff --git a/build.zig b/build.zig index 3576248..179dc5f 100644 --- a/build.zig +++ b/build.zig @@ -32,15 +32,9 @@ const LuaVersion = enum { }; fn compileRaylib(b: *std.Build, os: std.Target.Os.Tag, c: *std.Build.Step.Compile) void { - // TODO: find out how to send our target to this build cmd - const raylib = b.addSystemCommand(&.{ "zig", "build" }); - raylib.setCwd(b.path("foreign/raylib/")); - raylib.stdio = .inherit; - - c.step.dependOn(&raylib.step); - c.addIncludePath(b.path("foreign/raylib/zig-out/include/")); - c.addLibraryPath(b.path("foreign/raylib/zig-out/lib/")); - c.linkSystemLibrary("raylib"); + const raylib = b.dependency("raylib", .{}); + c.addIncludePath(raylib.path(raylib.builder.h_dir)); + c.linkLibrary(raylib.artifact("raylib")); if (os == .windows) { c.linkSystemLibrary("WinMM"); c.linkSystemLibrary("GDI32"); diff --git a/build.zig.zon b/build.zig.zon new file mode 100644 index 0000000..856781d --- /dev/null +++ b/build.zig.zon @@ -0,0 +1,13 @@ +.{ + .name = .neonucleus, + .fingerprint = 0xc9c7605b6b82f1a7, + .version = "0.0.1", + .paths = .{ "data", "build.zig", "build.zig.zon", "src" }, + + .dependencies = .{ + .raylib = .{ + .url = "https://github.com/raysan5/raylib/archive/46f01e315d07d0b1fedd1a3c388d1acaa9f6ccd6.tar.gz", + .hash = "raylib-5.5.0-whq8uO5uNgRDK_yuN0AGftGhWSVyctgPQNALENrZHt3k", + }, + }, +} diff --git a/foreign/raylib b/foreign/raylib deleted file mode 160000 index 46f01e3..0000000 --- a/foreign/raylib +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 46f01e315d07d0b1fedd1a3c388d1acaa9f6ccd6