From 2e6112560167a3002ca331fc277b62a51bfa8561 Mon Sep 17 00:00:00 2001
From: Stephen Gutekanst <stephen@hexops.com>
Date: Sat, 27 Aug 2022 12:27:35 -0700
Subject: [PATCH] mach: expose sysaudio/sysjs packages

Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
---
 build.zig    | 11 +++++++----
 src/main.zig |  2 ++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/build.zig b/build.zig
index 7af77713..33d280cc 100644
--- a/build.zig
+++ b/build.zig
@@ -97,10 +97,8 @@ pub fn build(b: *std.build.Builder) void {
         inline for (example.packages) |p| {
             if (std.mem.eql(u8, p.name, freetype.pkg.name))
                 freetype.link(example_app.b, example_app.step, .{});
-
-            if (std.mem.eql(u8, p.name, sysaudio.pkg.name))
-                sysaudio.link(example_app.b, example_app.step, .{});
         }
+        sysaudio.link(example_app.b, example_app.step, .{});
 
         example_app.link(options);
         example_app.install();
@@ -151,6 +149,7 @@ pub fn build(b: *std.build.Builder) void {
     lib.addPackage(app_pkg);
     lib.addPackage(gpu.pkg);
     lib.addPackage(glfw.pkg);
+    lib.addPackage(sysaudio.pkg);
     glfw.link(b, lib, options.glfw_options);
     gpu.link(b, lib, options.gpuOptions());
     lib.setOutputDir("./libmach/build");
@@ -220,6 +219,7 @@ pub const App = struct {
         var deps = std.ArrayList(std.build.Pkg).init(b.allocator);
         deps.append(pkg) catch unreachable;
         deps.append(gpu.pkg) catch unreachable;
+        deps.append(sysaudio.pkg) catch unreachable;
         switch (platform) {
             .native => deps.append(glfw.pkg) catch unreachable,
             .web => deps.append(sysjs.pkg) catch unreachable,
@@ -236,15 +236,18 @@ pub const App = struct {
             if (platform == .web) {
                 const lib = b.addSharedLibrary(options.name, (comptime thisDir()) ++ "/src/platform/wasm.zig", .unversioned);
                 lib.addPackage(gpu.pkg);
+                lib.addPackage(sysaudio.pkg);
                 lib.addPackage(sysjs.pkg);
 
                 break :blk lib;
             } else {
                 const exe = b.addExecutable(options.name, (comptime thisDir()) ++ "/src/platform/native.zig");
                 exe.addPackage(gpu.pkg);
+                exe.addPackage(sysaudio.pkg);
                 exe.addPackage(glfw.pkg);
 
                 if (target.os.tag == .linux) {
+                    // TODO: add gamemode.pkg instead of using addPackagePath
                     exe.addPackagePath("gamemode", (comptime thisDir()) ++ "/libs/gamemode/gamemode.zig");
                 }
 
@@ -374,7 +377,7 @@ pub const App = struct {
 pub const pkg = std.build.Pkg{
     .name = "mach",
     .source = .{ .path = thisDir() ++ "/src/main.zig" },
-    .dependencies = &.{ gpu.pkg, ecs.pkg },
+    .dependencies = &.{ gpu.pkg, ecs.pkg, sysaudio.pkg },
 };
 
 fn thisDir() []const u8 {
diff --git a/src/main.zig b/src/main.zig
index cb1dcdb1..137a313d 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -5,6 +5,8 @@ pub const Timer = @import("Timer.zig");
 pub const ResourceManager = @import("resource/ResourceManager.zig");
 pub const gpu = @import("gpu");
 pub const ecs = @import("ecs");
+pub const sysaudio = @import("sysaudio");
+pub const sysjs = @import("sysjs");
 
 // Engine exports
 pub const App = @import("engine.zig").App;