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

all: pass xcode-frameworks dependency to gpu-dawn

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2023-07-03 20:19:00 -07:00
parent a96aac2954
commit 02b9f7d132
4 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
build.zig
View file

@ -1,17 +1,19 @@
const std = @import("std"); const std = @import("std");
const builtin = @import("builtin"); const builtin = @import("builtin");
const system_sdk = @import("libs/glfw/system_sdk.zig");
const glfw = @import("libs/glfw/build.zig"); const glfw = @import("libs/glfw/build.zig");
const freetype = @import("libs/freetype/build.zig"); const freetype = @import("libs/freetype/build.zig");
pub const gpu_dawn = @import("libs/gpu-dawn/sdk.zig").Sdk(.{ pub const gpu_dawn = @import("libs/gpu-dawn/sdk.zig").Sdk(.{
.glfw_include_dir = sdkPath("/libs/glfw/upstream/glfw/include"), // TODO(build-system): This cannot be imported with the Zig package manager
.system_sdk = system_sdk, // error: TarUnsupportedFileType
.xcode_frameworks = @import("libs/mach-gpu-dawn/libs/xcode-frameworks/build.zig"),
}); });
const gpu = @import("libs/gpu/sdk.zig").Sdk(.{ const gpu = @import("libs/gpu/sdk.zig").Sdk(.{
.gpu_dawn = gpu_dawn, .gpu_dawn = gpu_dawn,
}); });
const sysaudio = @import("libs/sysaudio/sdk.zig").Sdk(.{ const sysaudio = @import("libs/sysaudio/sdk.zig").Sdk(.{
.system_sdk = system_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 core = @import("libs/core/sdk.zig").Sdk(.{ const core = @import("libs/core/sdk.zig").Sdk(.{
.gpu = gpu, .gpu = gpu,

6
libs/core/build.zig
View file

@ -1,10 +1,10 @@
const std = @import("std"); const std = @import("std");
const builtin = @import("builtin"); const builtin = @import("builtin");
const system_sdk = @import("libs/mach-glfw/system_sdk.zig");
const glfw = @import("libs/mach-glfw/build.zig"); const glfw = @import("libs/mach-glfw/build.zig");
const gpu_dawn = @import("libs/mach-gpu-dawn/sdk.zig").Sdk(.{ const gpu_dawn = @import("libs/mach-gpu-dawn/sdk.zig").Sdk(.{
.glfw_include_dir = sdkPath("/libs/mach-glfw/upstream/glfw/include"), // TODO(build-system): This cannot be imported with the Zig package manager
.system_sdk = system_sdk, // error: TarUnsupportedFileType
.xcode_frameworks = @import("libs/mach-gpu-dawn/libs/xcode-frameworks/build.zig"),
}); });
const gpu = @import("libs/mach-gpu/sdk.zig").Sdk(.{ const gpu = @import("libs/mach-gpu/sdk.zig").Sdk(.{
.gpu_dawn = gpu_dawn, .gpu_dawn = gpu_dawn,

6
libs/gpu-dawn/build.zig
View file

@ -1,15 +1,15 @@
const std = @import("std"); const std = @import("std");
const Build = std.Build; const Build = std.Build;
const glfw = @import("libs/mach-glfw/build.zig"); const glfw = @import("libs/mach-glfw/build.zig");
const system_sdk = @import("libs/mach-glfw/system_sdk.zig");
const gpu_dawn_sdk = @import("sdk.zig"); const gpu_dawn_sdk = @import("sdk.zig");
pub fn build(b: *Build) !void { pub fn build(b: *Build) !void {
const optimize = b.standardOptimizeOption(.{}); const optimize = b.standardOptimizeOption(.{});
const target = b.standardTargetOptions(.{}); const target = b.standardTargetOptions(.{});
const gpu_dawn = gpu_dawn_sdk.Sdk(.{ const gpu_dawn = gpu_dawn_sdk.Sdk(.{
.glfw_include_dir = "libs/mach-glfw/upstream/glfw/include", // TODO(build-system): This cannot be imported with the Zig package manager
.system_sdk = system_sdk, // error: TarUnsupportedFileType
.xcode_frameworks = @import("libs/xcode-frameworks/build.zig"),
}); });
const options = gpu_dawn.Options{ const options = gpu_dawn.Options{

6
libs/gpu/build.zig
View file

@ -2,14 +2,14 @@ const std = @import("std");
const glfw = @import("libs/mach-glfw/build.zig"); const glfw = @import("libs/mach-glfw/build.zig");
const gpu_dawn_sdk = @import("libs/mach-gpu-dawn/sdk.zig"); const gpu_dawn_sdk = @import("libs/mach-gpu-dawn/sdk.zig");
const gpu_sdk = @import("sdk.zig"); const gpu_sdk = @import("sdk.zig");
const system_sdk = @import("libs/mach-glfw/system_sdk.zig");
pub fn build(b: *std.Build) !void { pub fn build(b: *std.Build) !void {
const optimize = b.standardOptimizeOption(.{}); const optimize = b.standardOptimizeOption(.{});
const target = b.standardTargetOptions(.{}); const target = b.standardTargetOptions(.{});
const gpu_dawn = gpu_dawn_sdk.Sdk(.{ const gpu_dawn = gpu_dawn_sdk.Sdk(.{
.glfw_include_dir = "libs/mach-glfw/upstream/glfw/include", // TODO(build-system): This cannot be imported with the Zig package manager
.system_sdk = system_sdk, // error: TarUnsupportedFileType
.xcode_frameworks = @import("libs/mach-gpu-dawn/libs/xcode-frameworks/build.zig"),
}); });
const gpu = gpu_sdk.Sdk(.{ const gpu = gpu_sdk.Sdk(.{
.gpu_dawn = gpu_dawn, .gpu_dawn = gpu_dawn,