From 02b9f7d132742fa64c0830b5b5fed810d8488a8d Mon Sep 17 00:00:00 2001
From: Stephen Gutekanst <stephen@hexops.com>
Date: Mon, 3 Jul 2023 20:19:00 -0700
Subject: [PATCH] all: pass xcode-frameworks dependency to gpu-dawn

Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
---
 build.zig               | 10 ++++++----
 libs/core/build.zig     |  6 +++---
 libs/gpu-dawn/build.zig |  6 +++---
 libs/gpu/build.zig      |  6 +++---
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/build.zig b/build.zig
index 37acd09a..e8c9d7da 100644
--- a/build.zig
+++ b/build.zig
@@ -1,17 +1,19 @@
 const std = @import("std");
 const builtin = @import("builtin");
-const system_sdk = @import("libs/glfw/system_sdk.zig");
 const glfw = @import("libs/glfw/build.zig");
 const freetype = @import("libs/freetype/build.zig");
 pub const gpu_dawn = @import("libs/gpu-dawn/sdk.zig").Sdk(.{
-    .glfw_include_dir = sdkPath("/libs/glfw/upstream/glfw/include"),
-    .system_sdk = system_sdk,
+    // TODO(build-system): This cannot be imported with the Zig package manager
+    // error: TarUnsupportedFileType
+    .xcode_frameworks = @import("libs/mach-gpu-dawn/libs/xcode-frameworks/build.zig"),
 });
 const gpu = @import("libs/gpu/sdk.zig").Sdk(.{
     .gpu_dawn = gpu_dawn,
 });
 const sysaudio = @import("libs/sysaudio/sdk.zig").Sdk(.{
-    .system_sdk = system_sdk,
+    // TODO(build-system): This cannot be imported with the Zig package manager
+    // error: TarUnsupportedFileType
+    .xcode_frameworks = @import("libs/mach-gpu-dawn/libs/xcode-frameworks/build.zig"),
 });
 const core = @import("libs/core/sdk.zig").Sdk(.{
     .gpu = gpu,
diff --git a/libs/core/build.zig b/libs/core/build.zig
index 89c86dda..3bb9874f 100644
--- a/libs/core/build.zig
+++ b/libs/core/build.zig
@@ -1,10 +1,10 @@
 const std = @import("std");
 const builtin = @import("builtin");
-const system_sdk = @import("libs/mach-glfw/system_sdk.zig");
 const glfw = @import("libs/mach-glfw/build.zig");
 const gpu_dawn = @import("libs/mach-gpu-dawn/sdk.zig").Sdk(.{
-    .glfw_include_dir = sdkPath("/libs/mach-glfw/upstream/glfw/include"),
-    .system_sdk = system_sdk,
+    // TODO(build-system): This cannot be imported with the Zig package manager
+    // error: TarUnsupportedFileType
+    .xcode_frameworks = @import("libs/mach-gpu-dawn/libs/xcode-frameworks/build.zig"),
 });
 const gpu = @import("libs/mach-gpu/sdk.zig").Sdk(.{
     .gpu_dawn = gpu_dawn,
diff --git a/libs/gpu-dawn/build.zig b/libs/gpu-dawn/build.zig
index 3aa86d1f..0a3c8d47 100644
--- a/libs/gpu-dawn/build.zig
+++ b/libs/gpu-dawn/build.zig
@@ -1,15 +1,15 @@
 const std = @import("std");
 const Build = std.Build;
 const glfw = @import("libs/mach-glfw/build.zig");
-const system_sdk = @import("libs/mach-glfw/system_sdk.zig");
 const gpu_dawn_sdk = @import("sdk.zig");
 
 pub fn build(b: *Build) !void {
     const optimize = b.standardOptimizeOption(.{});
     const target = b.standardTargetOptions(.{});
     const gpu_dawn = gpu_dawn_sdk.Sdk(.{
-        .glfw_include_dir = "libs/mach-glfw/upstream/glfw/include",
-        .system_sdk = system_sdk,
+        // TODO(build-system): This cannot be imported with the Zig package manager
+        // error: TarUnsupportedFileType
+        .xcode_frameworks = @import("libs/xcode-frameworks/build.zig"),
     });
 
     const options = gpu_dawn.Options{
diff --git a/libs/gpu/build.zig b/libs/gpu/build.zig
index 8085ef22..4019028b 100644
--- a/libs/gpu/build.zig
+++ b/libs/gpu/build.zig
@@ -2,14 +2,14 @@ const std = @import("std");
 const glfw = @import("libs/mach-glfw/build.zig");
 const gpu_dawn_sdk = @import("libs/mach-gpu-dawn/sdk.zig");
 const gpu_sdk = @import("sdk.zig");
-const system_sdk = @import("libs/mach-glfw/system_sdk.zig");
 
 pub fn build(b: *std.Build) !void {
     const optimize = b.standardOptimizeOption(.{});
     const target = b.standardTargetOptions(.{});
     const gpu_dawn = gpu_dawn_sdk.Sdk(.{
-        .glfw_include_dir = "libs/mach-glfw/upstream/glfw/include",
-        .system_sdk = system_sdk,
+        // TODO(build-system): This cannot be imported with the Zig package manager
+        // error: TarUnsupportedFileType
+        .xcode_frameworks = @import("libs/mach-gpu-dawn/libs/xcode-frameworks/build.zig"),
     });
     const gpu = gpu_sdk.Sdk(.{
         .gpu_dawn = gpu_dawn,