From 2ba7e48ac20cb656c14fa7eb9ccf5b72b4f61852 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Fri, 9 Sep 2022 21:55:38 -0700 Subject: [PATCH] {sysjs,mach}: correctly pass sysjs dependency to sdk Signed-off-by: Stephen Gutekanst --- build.zig | 1 + libs/sysaudio/build.zig | 2 ++ libs/sysaudio/sdk.zig | 3 +-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build.zig b/build.zig index 47f801f3..c8b8d59f 100644 --- a/build.zig +++ b/build.zig @@ -22,6 +22,7 @@ const gpu = gpu_sdk.Sdk(.{ }); const sysaudio = sysaudio_sdk.Sdk(.{ .system_sdk = system_sdk, + .sysjs = sysjs, }); pub fn build(b: *std.build.Builder) void { diff --git a/libs/sysaudio/build.zig b/libs/sysaudio/build.zig index 9976123e..4d07f851 100644 --- a/libs/sysaudio/build.zig +++ b/libs/sysaudio/build.zig @@ -1,12 +1,14 @@ const std = @import("std"); const sysaudio_sdk = @import("sdk.zig"); const system_sdk = @import("libs/mach-glfw/system_sdk.zig"); +const sysjs = @import("libs/mach-sysjs/build.zig"); pub fn build(b: *std.build.Builder) void { const mode = b.standardReleaseOptions(); const target = b.standardTargetOptions(.{}); const sysaudio = sysaudio_sdk.Sdk(.{ .system_sdk = system_sdk, + .sysjs = sysjs, }); const test_step = b.step("test", "Run library tests"); diff --git a/libs/sysaudio/sdk.zig b/libs/sysaudio/sdk.zig index f923cb7d..35105547 100644 --- a/libs/sysaudio/sdk.zig +++ b/libs/sysaudio/sdk.zig @@ -1,5 +1,4 @@ const std = @import("std"); -const sysjs = @import("libs/mach-sysjs/build.zig"); pub fn Sdk(comptime deps: anytype) type { return struct { @@ -8,7 +7,7 @@ pub fn Sdk(comptime deps: anytype) type { pub const pkg = std.build.Pkg{ .name = "sysaudio", .source = .{ .path = thisDir() ++ "/src/main.zig" }, - .dependencies = &.{ sysjs.pkg, soundio_pkg }, + .dependencies = &.{ deps.sysjs.pkg, soundio_pkg }, }; pub const soundio_pkg = std.build.Pkg{