Skip to content

Commit 44a450e

Browse files
BeyleyBeyley
committed
shader spirv cross reflect c
1 parent 41e7d46 commit 44a450e

File tree

3 files changed

+26
-25
lines changed

3 files changed

+26
-25
lines changed

‎build/nuke/Native/SPIRVCross.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,15 +123,15 @@ pub fn build(b: *std.Build) void {
123123
{ //Windows
124124
//Build for Windows x86_64
125125
InheritedShell($"zig build {releaseMode} -Dtarget=x86_64-windows --verbose", SPIRVCrossPath).AssertZeroExitCode();
126-
CopyFile(SPIRVCrossPath / "zig-out" / "lib" / "spirv-cross.dll", runtimes / "win-x64" / "native" / "spirv-cross.dll", FileExistsPolicy.Overwrite);
126+
CopyFile(SPIRVCrossPath / "zig-out" / "bin" / "spirv-cross.dll", runtimes / "win-x64" / "native" / "spirv-cross.dll", FileExistsPolicy.Overwrite);
127127

128128
//Build for Windows x86
129129
InheritedShell($"zig build {releaseMode} -Dtarget=x86-windows --verbose", SPIRVCrossPath).AssertZeroExitCode();
130-
CopyFile(SPIRVCrossPath / "zig-out" / "lib" / "spirv-cross.dll", runtimes / "win-x86" / "native" / "spirv-cross.dll", FileExistsPolicy.Overwrite);
130+
CopyFile(SPIRVCrossPath / "zig-out" / "bin" / "spirv-cross.dll", runtimes / "win-x86" / "native" / "spirv-cross.dll", FileExistsPolicy.Overwrite);
131131

132132
//Build for Windows arm64
133133
InheritedShell($"zig build {releaseMode} -Dtarget=aarch64-windows --verbose", SPIRVCrossPath).AssertZeroExitCode();
134-
CopyFile(SPIRVCrossPath / "zig-out" / "lib" / "spirv-cross.dll", runtimes / "win-arm64" / "native" / "spirv-cross.dll", FileExistsPolicy.Overwrite);
134+
CopyFile(SPIRVCrossPath / "zig-out" / "bin" / "spirv-cross.dll", runtimes / "win-arm64" / "native" / "spirv-cross.dll", FileExistsPolicy.Overwrite);
135135
}
136136

137137
{ //MacOS

‎build/nuke/Native/SPIRVReflect.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,15 @@ pub fn build(b: *std.Build) void {
8484
{ //Windows
8585
//Build for Windows x86_64
8686
InheritedShell($"zig build {buildMode} -Dtarget=x86_64-windows --verbose", SPIRVReflectPath).AssertZeroExitCode();
87-
CopyFile(SPIRVReflectPath / "zig-out" / "lib" / "spirv-reflect.dll", runtimes / "win-x64" / "native" / "spirv-reflect.dll", FileExistsPolicy.Overwrite);
87+
CopyFile(SPIRVReflectPath / "zig-out" / "bin" / "spirv-reflect.dll", runtimes / "win-x64" / "native" / "spirv-reflect.dll", FileExistsPolicy.Overwrite);
8888

8989
//Build for Windows x86
9090
InheritedShell($"zig build {buildMode} -Dtarget=x86-windows --verbose", SPIRVReflectPath).AssertZeroExitCode();
91-
CopyFile(SPIRVReflectPath / "zig-out" / "lib" / "spirv-reflect.dll", runtimes / "win-x86" / "native" / "spirv-reflect.dll", FileExistsPolicy.Overwrite);
91+
CopyFile(SPIRVReflectPath / "zig-out" / "bin" / "spirv-reflect.dll", runtimes / "win-x86" / "native" / "spirv-reflect.dll", FileExistsPolicy.Overwrite);
9292

9393
//Build for Windows arm64
9494
InheritedShell($"zig build {buildMode} -Dtarget=aarch64-windows --verbose", SPIRVReflectPath).AssertZeroExitCode();
95-
CopyFile(SPIRVReflectPath / "zig-out" / "lib" / "spirv-reflect.dll", runtimes / "win-arm64" / "native" / "spirv-reflect.dll", FileExistsPolicy.Overwrite);
95+
CopyFile(SPIRVReflectPath / "zig-out" / "bin" / "spirv-reflect.dll", runtimes / "win-arm64" / "native" / "spirv-reflect.dll", FileExistsPolicy.Overwrite);
9696
}
9797

9898
{ //MacOS

‎build/nuke/Native/Shaderc.cs‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -148,17 +148,18 @@ fn spvTools(b: *std.Build, target: std.Build.ResolvedTarget, optimize: std.built
148148
spirv_tools.step.dependOn(&spvtoolsVendorTables(b, ""opencl.debuginfo.100"", ""CLDEBUG100_"").step);
149149
spirv_tools.step.dependOn(&spvtoolsVendorTables(b, ""nonsemantic.shader.debuginfo.100"", ""SHDEBUG100_"").step);
150150
spirv_tools.step.dependOn(&spvtoolsVendorTables(b, ""nonsemantic.clspvreflection"", """").step);
151+
spirv_tools.step.dependOn(&spvtoolsVendorTables(b, ""nonsemantic.vkspreflection"", """").step);
151152
152153
//them headers
153154
spirv_tools.step.dependOn(&debug_info_header.step);
154155
spirv_tools.step.dependOn(&cl_debug_info_header_100.step);
155156
spirv_tools.step.dependOn(&non_semantic_shader_debug_info_100.step);
156157
157-
spirv_tools.addIncludePath(.{ .path = spirv_tools_root ++ ""include"" });
158-
spirv_tools.addIncludePath(.{ .path = spirv_tools_root ++ ""source"" });
159-
spirv_tools.addIncludePath(.{ .path = spirv_tools_root });
158+
spirv_tools.addIncludePath(b.path(spirv_tools_root ++ ""include""));
159+
spirv_tools.addIncludePath(b.path(spirv_tools_root ++ ""source""));
160+
spirv_tools.addIncludePath(b.path(spirv_tools_root));
160161
161-
spirv_tools.addIncludePath(.{ .path = ""third_party/spirv-headers/include/"" });
162+
spirv_tools.addIncludePath(b.path(""third_party/spirv-headers/include/""));
162163
163164
spirv_tools.addCSourceFiles(.{
164165
.files = &.{
@@ -406,8 +407,8 @@ fn glslangLib(b: *std.Build, target: std.Build.ResolvedTarget, optimize: std.bui
406407
glslang.linkLibC();
407408
glslang.linkLibCpp();
408409
409-
glslang.addIncludePath(.{ .path = root_glslang_path ++ ""Include"" });
410-
glslang.addIncludePath(.{ .path = root_glslang_path });
410+
glslang.addIncludePath(b.path(root_glslang_path ++ ""Include""));
411+
glslang.addIncludePath(b.path(root_glslang_path));
411412
412413
glslang.defineCMacro(""ENABLE_HLSL"", ""1"");
413414
@@ -505,12 +506,12 @@ pub fn build(b: *std.Build) void {
505506
});
506507
shaderc_util.linkLibC();
507508
shaderc_util.linkLibCpp();
508-
shaderc_util.addIncludePath(.{ .path = ""libshaderc/include"" });
509-
shaderc_util.addIncludePath(.{ .path = ""libshaderc_util/include"" });
509+
shaderc_util.addIncludePath(b.path(""libshaderc/include""));
510+
shaderc_util.addIncludePath(b.path(""libshaderc_util/include""));
510511
511-
shaderc_util.addIncludePath(.{ .path = ""third_party/glslang"" });
512-
shaderc_util.addIncludePath(.{ .path = ""third_party/spirv-tools/include"" });
513-
shaderc_util.addIncludePath(.{ .path = ""third_party/spirv-headers/include/"" });
512+
shaderc_util.addIncludePath(b.path(""third_party/glslang""));
513+
shaderc_util.addIncludePath(b.path(""third_party/spirv-tools/include""));
514+
shaderc_util.addIncludePath(b.path(""third_party/spirv-headers/include/""));
514515
515516
shaderc_util.defineCMacro(""ENABLE_HLSL"", ""1"");
516517
@@ -547,12 +548,12 @@ pub fn build(b: *std.Build) void {
547548
shaderc.root_module.strip = true;
548549
}
549550
550-
shaderc.addIncludePath(.{ .path = ""libshaderc/include"" });
551-
shaderc.addIncludePath(.{ .path = ""libshaderc_util/include"" });
551+
shaderc.addIncludePath(b.path(""libshaderc/include""));
552+
shaderc.addIncludePath(b.path(""libshaderc_util/include""));
552553
553-
shaderc.addIncludePath(.{ .path = ""third_party/glslang"" });
554-
shaderc.addIncludePath(.{ .path = ""third_party/spirv-tools/include"" });
555-
shaderc.addIncludePath(.{ .path = ""third_party/spirv-headers/include/"" });
554+
shaderc.addIncludePath(b.path(""third_party/glslang""));
555+
shaderc.addIncludePath(b.path(""third_party/spirv-tools/include""));
556+
shaderc.addIncludePath(b.path(""third_party/spirv-headers/include/""));
556557
557558
shaderc.addCSourceFiles(.{
558559
.files = &.{
@@ -600,15 +601,15 @@ pub fn build(b: *std.Build) void {
600601

601602
//Build shaderc for Windows x86
602603
InheritedShell($"zig build -Dtarget=x86-windows-gnu {optimizeMode}", ShadercPath).AssertZeroExitCode();
603-
CopyFile(ShadercPath / "zig-out" / "lib" / $"{libname}.dll", runtimes / "win-x86" / "native" / $"{libname}.dll", FileExistsPolicy.Overwrite);
604+
CopyFile(ShadercPath / "zig-out" / "bin" / $"{libname}.dll", runtimes / "win-x86" / "native" / $"{libname}.dll", FileExistsPolicy.Overwrite);
604605

605606
//Build shaderc for Windows x86_64
606607
InheritedShell($"zig build -Dtarget=x86_64-windows-gnu {optimizeMode}", ShadercPath).AssertZeroExitCode();
607-
CopyFile(ShadercPath / "zig-out" / "lib" / $"{libname}.dll", runtimes / "win-x64" / "native" / $"{libname}.dll", FileExistsPolicy.Overwrite);
608+
CopyFile(ShadercPath / "zig-out" / "bin" / $"{libname}.dll", runtimes / "win-x64" / "native" / $"{libname}.dll", FileExistsPolicy.Overwrite);
608609

609610
//Build shaderc for Windows ARM64
610611
InheritedShell($"zig build -Dtarget=aarch64-windows-gnu {optimizeMode}", ShadercPath).AssertZeroExitCode();
611-
CopyFile(ShadercPath / "zig-out" / "lib" / $"{libname}.dll", runtimes / "win-arm64" / "native" / $"{libname}.dll", FileExistsPolicy.Overwrite);
612+
CopyFile(ShadercPath / "zig-out" / "bin" / $"{libname}.dll", runtimes / "win-arm64" / "native" / $"{libname}.dll", FileExistsPolicy.Overwrite);
612613

613614
//Build shaderc for MacOS x86_64
614615
InheritedShell($"zig build -Dtarget=x86_64-macos {optimizeMode}", ShadercPath).AssertZeroExitCode();

0 commit comments

Comments
 (0)