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

gpu-dawn: remove xcode_frameworks submodule; Sdk type

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2023-07-06 23:55:28 -07:00
parent 5aa06c2234
commit 2caffc8d35
4 changed files with 1682 additions and 1594 deletions
Download patch file Download diff file Expand all files Collapse all files

6
build.zig
View file

@ -3,11 +3,7 @@ const builtin = @import("builtin");
const freetype = @import("libs/freetype/build.zig"); const freetype = @import("libs/freetype/build.zig");
const glfw = @import("libs/glfw/build.zig"); const glfw = @import("libs/glfw/build.zig");
const sysaudio = @import("mach_sysaudio"); const sysaudio = @import("mach_sysaudio");
pub const gpu_dawn = @import("libs/gpu-dawn/build.zig").Sdk(.{ pub const gpu_dawn = @import("libs/gpu-dawn/build.zig"); // TODO(build-system): make this private
// TODO(build-system): This cannot be imported with the Zig package manager
// error: TarUnsupportedFileType
.xcode_frameworks = @import("libs/gpu-dawn/libs/xcode-frameworks/build.zig"),
});
const gpu = @import("libs/gpu/build.zig").Sdk(.{ const gpu = @import("libs/gpu/build.zig").Sdk(.{
.gpu_dawn = gpu_dawn, .gpu_dawn = gpu_dawn,
}); });

6
libs/core/build.zig
View file

@ -1,11 +1,7 @@
const std = @import("std"); const std = @import("std");
const builtin = @import("builtin"); const builtin = @import("builtin");
const glfw = @import("libs/mach-glfw/build.zig"); const glfw = @import("libs/mach-glfw/build.zig");
const gpu_dawn = @import("libs/mach-gpu-dawn/build.zig").Sdk(.{ const gpu_dawn = @import("libs/mach-gpu-dawn/build.zig");
// 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 gpu = @import("libs/mach-gpu/build.zig").Sdk(.{ const gpu = @import("libs/mach-gpu/build.zig").Sdk(.{
.gpu_dawn = gpu_dawn, .gpu_dawn = gpu_dawn,
}); });

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

File diff suppressed because it is too large Load diff

6
libs/gpu/build.zig
View file

@ -4,11 +4,7 @@ pub fn build(b: *std.Build) !void {
const optimize = b.standardOptimizeOption(.{}); const optimize = b.standardOptimizeOption(.{});
const target = b.standardTargetOptions(.{}); const target = b.standardTargetOptions(.{});
const glfw = @import("libs/mach-glfw/build.zig"); const glfw = @import("libs/mach-glfw/build.zig");
const gpu_dawn = @import("libs/mach-gpu-dawn/build.zig").Sdk(.{ const gpu_dawn = @import("libs/mach-gpu-dawn/build.zig");
// 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 gpu = Sdk(.{ const gpu = Sdk(.{
.gpu_dawn = gpu_dawn, .gpu_dawn = gpu_dawn,
}); });