zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gpu-dawn: use source scanning for spirv_cross target

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2022-02-13 01:34:49 -07:00 • committed by Stephen Gutekanst
parent bb32ce8c97
commit 4ac07b8f13
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
gpu-dawn/build.zig
View file

@ -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;
}

9
gpu-dawn/src/dawn/sources/spirv_cross.cpp
View file

@ -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"