From f4c72c3f27278e3737db35fe3aeb7b4672430812 Mon Sep 17 00:00:00 2001
From: Stephen Gutekanst <stephen@hexops.com>
Date: Mon, 3 Jul 2023 22:11:06 -0700
Subject: [PATCH] all: update to latest mach-glfw build API

Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
---
 build.zig               | 18 +++++++++++-------
 libs/core/build.zig     |  6 +++++-
 libs/glfw/README.md     |  6 +++++-
 libs/gpu-dawn/build.zig |  6 +++++-
 libs/gpu/build.zig      |  6 +++++-
 5 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/build.zig b/build.zig
index e8c9d7da..7c62ca75 100644
--- a/build.zig
+++ b/build.zig
@@ -1,19 +1,23 @@
 const std = @import("std");
 const builtin = @import("builtin");
-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(.{
+const glfw = @import("libs/glfw/sdk.zig").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,
+    .xcode_frameworks = @import("libs/gpu-dawn/libs/xcode-frameworks/build.zig"),
 });
 const sysaudio = @import("libs/sysaudio/sdk.zig").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"),
+    .xcode_frameworks = @import("libs/gpu-dawn/libs/xcode-frameworks/build.zig"),
+});
+pub const gpu_dawn = @import("libs/gpu-dawn/sdk.zig").Sdk(.{
+    // TODO(build-system): This cannot be imported with the Zig package manager
+    // error: TarUnsupportedFileType
+    .xcode_frameworks = @import("libs/gpu-dawn/libs/xcode-frameworks/build.zig"),
+});
+const gpu = @import("libs/gpu/sdk.zig").Sdk(.{
+    .gpu_dawn = gpu_dawn,
 });
 const core = @import("libs/core/sdk.zig").Sdk(.{
     .gpu = gpu,
diff --git a/libs/core/build.zig b/libs/core/build.zig
index 3bb9874f..c07e4392 100644
--- a/libs/core/build.zig
+++ b/libs/core/build.zig
@@ -1,6 +1,10 @@
 const std = @import("std");
 const builtin = @import("builtin");
-const glfw = @import("libs/mach-glfw/build.zig");
+const glfw = @import("libs/mach-glfw/sdk.zig").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_dawn = @import("libs/mach-gpu-dawn/sdk.zig").Sdk(.{
     // TODO(build-system): This cannot be imported with the Zig package manager
     // error: TarUnsupportedFileType
diff --git a/libs/glfw/README.md b/libs/glfw/README.md
index 5dd33be2..bc12457b 100644
--- a/libs/glfw/README.md
+++ b/libs/glfw/README.md
@@ -54,7 +54,11 @@ Then in your `build.zig` add:
 
 ```zig
 ...
-const glfw = @import("libs/mach-glfw/build.zig");
+const glfw = @import("libs/mach-glfw/sdk.zig").Sdk(.{
+    // TODO(build-system): This cannot be imported with the Zig package manager
+    // error: TarUnsupportedFileType
+    .xcode_frameworks = @import("libs/mach-glfw/libs/xcode-frameworks/build.zig"),
+});
 
 pub fn build(b: *Build) !void {
     ...
diff --git a/libs/gpu-dawn/build.zig b/libs/gpu-dawn/build.zig
index 2e153897..d7c29eff 100644
--- a/libs/gpu-dawn/build.zig
+++ b/libs/gpu-dawn/build.zig
@@ -1,6 +1,10 @@
 const std = @import("std");
 const Build = std.Build;
-const glfw = @import("libs/mach-glfw/build.zig");
+const glfw = @import("libs/mach-glfw/sdk.zig").Sdk(.{
+    // TODO(build-system): This cannot be imported with the Zig package manager
+    // error: TarUnsupportedFileType
+    .xcode_frameworks = @import("libs/xcode-frameworks/build.zig"),
+});
 const gpu_dawn_sdk = @import("sdk.zig");
 
 pub fn build(b: *Build) !void {
diff --git a/libs/gpu/build.zig b/libs/gpu/build.zig
index 4019028b..2342052d 100644
--- a/libs/gpu/build.zig
+++ b/libs/gpu/build.zig
@@ -1,5 +1,9 @@
 const std = @import("std");
-const glfw = @import("libs/mach-glfw/build.zig");
+const glfw = @import("libs/mach-glfw/sdk.zig").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_dawn_sdk = @import("libs/mach-gpu-dawn/sdk.zig");
 const gpu_sdk = @import("sdk.zig");