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

gpu-dawn: remove system_sdk dependency on windows/linux

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2023-07-03 11:05:06 -07:00
parent 6fe196acd7
commit 37755a1496
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
libs/gpu-dawn/sdk.zig
View file

@ -63,7 +63,7 @@ pub fn Sdk(comptime deps: anytype) type {
const opt = options.detectDefaults(step.target_info.target); const opt = options.detectDefaults(step.target_info.target);
// TODO(build-system): pass system SDK options through // TODO(build-system): pass system SDK options through
if (step.target_info.target.os.tag != .windows) deps.system_sdk.include(b, step, .{}); if (step.target_info.target.os.tag == .macos) deps.system_sdk.include(b, step, .{});
if (step.target_info.target.os.tag == .windows) @import("direct3d_headers").addLibraryPath(step); if (step.target_info.target.os.tag == .windows) @import("direct3d_headers").addLibraryPath(step);
try if (options.from_source) try if (options.from_source)
@ -544,7 +544,7 @@ pub fn Sdk(comptime deps: anytype) type {
fn linkLibDawnCommonDependencies(b: *Build, step: *std.build.CompileStep, options: Options) void { fn linkLibDawnCommonDependencies(b: *Build, step: *std.build.CompileStep, options: Options) void {
_ = options; _ = options;
step.linkLibCpp(); step.linkLibCpp();
if (step.target_info.target.os.tag != .windows) deps.system_sdk.include(b, step, .{}); if (step.target_info.target.os.tag == .macos) deps.system_sdk.include(b, step, .{});
if (step.target_info.target.os.tag == .macos) { if (step.target_info.target.os.tag == .macos) {
step.linkSystemLibraryName("objc"); step.linkSystemLibraryName("objc");
step.linkFramework("Foundation"); step.linkFramework("Foundation");
@ -602,7 +602,7 @@ pub fn Sdk(comptime deps: anytype) type {
fn linkLibDawnPlatformDependencies(b: *Build, step: *std.build.CompileStep, options: Options) void { fn linkLibDawnPlatformDependencies(b: *Build, step: *std.build.CompileStep, options: Options) void {
_ = options; _ = options;
step.linkLibCpp(); step.linkLibCpp();
if (step.target_info.target.os.tag != .windows) deps.system_sdk.include(b, step, .{}); if (step.target_info.target.os.tag == .macos) deps.system_sdk.include(b, step, .{});
} }
// Build dawn platform sources; derived from src/dawn/platform/BUILD.gn // Build dawn platform sources; derived from src/dawn/platform/BUILD.gn
@ -676,7 +676,7 @@ pub fn Sdk(comptime deps: anytype) type {
fn linkLibDawnNativeDependencies(b: *Build, step: *std.build.CompileStep, options: Options) void { fn linkLibDawnNativeDependencies(b: *Build, step: *std.build.CompileStep, options: Options) void {
step.linkLibCpp(); step.linkLibCpp();
if (step.target_info.target.os.tag != .windows) deps.system_sdk.include(b, step, .{}); if (step.target_info.target.os.tag == .macos) deps.system_sdk.include(b, step, .{});
if (options.d3d12.?) { if (options.d3d12.?) {
step.linkLibrary(b.dependency("direct3d_headers", .{ step.linkLibrary(b.dependency("direct3d_headers", .{
.target = step.target, .target = step.target,
@ -977,7 +977,7 @@ pub fn Sdk(comptime deps: anytype) type {
fn linkLibTintDependencies(b: *Build, step: *std.build.CompileStep, options: Options) void { fn linkLibTintDependencies(b: *Build, step: *std.build.CompileStep, options: Options) void {
_ = options; _ = options;
step.linkLibCpp(); step.linkLibCpp();
if (step.target_info.target.os.tag != .windows) deps.system_sdk.include(b, step, .{}); if (step.target_info.target.os.tag == .macos) deps.system_sdk.include(b, step, .{});
} }
// Builds tint sources; derived from src/tint/BUILD.gn // Builds tint sources; derived from src/tint/BUILD.gn
@ -1144,7 +1144,7 @@ pub fn Sdk(comptime deps: anytype) type {
fn linkLibSPIRVToolsDependencies(b: *Build, step: *std.build.CompileStep, options: Options) void { fn linkLibSPIRVToolsDependencies(b: *Build, step: *std.build.CompileStep, options: Options) void {
_ = options; _ = options;
step.linkLibCpp(); step.linkLibCpp();
if (step.target_info.target.os.tag != .windows) deps.system_sdk.include(b, step, .{}); if (step.target_info.target.os.tag == .macos) deps.system_sdk.include(b, step, .{});
} }
// Builds third_party/vulkan-deps/spirv-tools sources; derived from third_party/vulkan-deps/spirv-tools/src/BUILD.gn // Builds third_party/vulkan-deps/spirv-tools sources; derived from third_party/vulkan-deps/spirv-tools/src/BUILD.gn
@ -1210,7 +1210,7 @@ pub fn Sdk(comptime deps: anytype) type {
fn linkLibAbseilCppDependencies(b: *Build, step: *std.build.CompileStep, options: Options) void { fn linkLibAbseilCppDependencies(b: *Build, step: *std.build.CompileStep, options: Options) void {
_ = options; _ = options;
step.linkLibCpp(); step.linkLibCpp();
if (step.target_info.target.os.tag != .windows) deps.system_sdk.include(b, step, .{}); if (step.target_info.target.os.tag == .macos) deps.system_sdk.include(b, step, .{});
const target = step.target_info.target; const target = step.target_info.target;
if (target.os.tag == .macos) { if (target.os.tag == .macos) {
step.linkSystemLibraryName("objc"); step.linkSystemLibraryName("objc");
@ -1288,7 +1288,7 @@ pub fn Sdk(comptime deps: anytype) type {
fn linkLibDawnWireDependencies(b: *Build, step: *std.build.CompileStep, options: Options) void { fn linkLibDawnWireDependencies(b: *Build, step: *std.build.CompileStep, options: Options) void {
_ = options; _ = options;
step.linkLibCpp(); step.linkLibCpp();
if (step.target_info.target.os.tag != .windows) deps.system_sdk.include(b, step, .{}); if (step.target_info.target.os.tag == .macos) deps.system_sdk.include(b, step, .{});
} }
// Buids dawn wire sources; derived from src/dawn/wire/BUILD.gn // Buids dawn wire sources; derived from src/dawn/wire/BUILD.gn