From 4ac07b8f13c9e7fa0360b7fe6d0cba7b8990259d Mon Sep 17 00:00:00 2001
From: Stephen Gutekanst <stephen@hexops.com>
Date: Sun, 13 Feb 2022 01:34:49 -0700
Subject: [PATCH] gpu-dawn: use source scanning for spirv_cross target

Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
---
 gpu-dawn/build.zig                        | 13 +++++++++++--
 gpu-dawn/src/dawn/sources/spirv_cross.cpp |  9 ---------
 2 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 gpu-dawn/src/dawn/sources/spirv_cross.cpp

diff --git a/gpu-dawn/build.zig b/gpu-dawn/build.zig
index 214be817..a0cb2772 100644
--- a/gpu-dawn/build.zig
+++ b/gpu-dawn/build.zig
@@ -1058,8 +1058,17 @@ fn buildLibSPIRVCross(b: *Builder, step: *std.build.LibExeObjStep, options: Opti
     const target = (std.zig.system.NativeTargetInfo.detect(b.allocator, step.target) catch unreachable).target;
     if (target.os.tag != .windows) flags.append("-fno-exceptions") catch unreachable;
 
-    // spvtools_link
-    lib.addCSourceFile(thisDir() ++ "/src/dawn/sources/spirv_cross.cpp", flags.items);
+    // spirv_cross
+    var sources = std.ArrayList([]const u8).init(b.allocator);
+    scanSources(
+        b,
+        &sources,
+        "libs/dawn/third_party/vulkan-deps/spirv-cross/src/",
+        &.{ ".cpp", ".c", ".cc" },
+        &.{},
+        &.{ "test", "benchmark" },
+    ) catch unreachable;
+    lib.addCSourceFiles(sources.items, flags.items);
     return lib;
 }
 
diff --git a/gpu-dawn/src/dawn/sources/spirv_cross.cpp b/gpu-dawn/src/dawn/sources/spirv_cross.cpp
deleted file mode 100644
index fcb2411c..00000000
--- a/gpu-dawn/src/dawn/sources/spirv_cross.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "third_party/vulkan-deps/spirv-cross/src/spirv_cfg.cpp"
-#include "third_party/vulkan-deps/spirv-cross/src/spirv_cross.cpp"
-#include "third_party/vulkan-deps/spirv-cross/src/spirv_cross_parsed_ir.cpp"
-#include "third_party/vulkan-deps/spirv-cross/src/spirv_cross_util.cpp"
-#include "third_party/vulkan-deps/spirv-cross/src/spirv_glsl.cpp"
-#include "third_party/vulkan-deps/spirv-cross/src/spirv_hlsl.cpp"
-#include "third_party/vulkan-deps/spirv-cross/src/spirv_msl.cpp"
-#include "third_party/vulkan-deps/spirv-cross/src/spirv_parser.cpp"
-#include "third_party/vulkan-deps/spirv-cross/src/spirv_reflect.cpp"