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

sysaudio: replace system_sdk with xcode-frameworks

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2023-07-03 16:18:58 -07:00
parent 4142930bde
commit cfe85f915a
3 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libs/sysaudio/build.zig
View file

@ -1,12 +1,13 @@
const std = @import("std"); const std = @import("std");
const sysaudio_sdk = @import("sdk.zig"); const sysaudio_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 sysaudio = sysaudio_sdk.Sdk(.{ const sysaudio = sysaudio_sdk.Sdk(.{
.system_sdk = system_sdk, // TODO(build-system): This cannot be imported with the Zig package manager
// error: TarUnsupportedFileType
.xcode_frameworks = @import("libs/xcode-frameworks//build.zig"),
}); });
const test_step = b.step("test", "Run library tests"); const test_step = b.step("test", "Run library tests");

1
libs/sysaudio/libs/mach-glfw
View file

@ -1 +0,0 @@
../../glfw

15
libs/sysaudio/sdk.zig
View file

@ -4,9 +4,6 @@ pub fn Sdk(comptime deps: anytype) type {
return struct { return struct {
pub const Options = struct { pub const Options = struct {
install_libs: bool = false, install_libs: bool = false,
/// System SDK options.
system_sdk: deps.system_sdk.Options = .{},
}; };
var _module: ?*std.build.Module = null; var _module: ?*std.build.Module = null;
@ -47,9 +44,17 @@ pub fn Sdk(comptime deps: anytype) type {
pub fn link(b: *std.Build, step: *std.build.CompileStep, options: Options) void { pub fn link(b: *std.Build, step: *std.build.CompileStep, options: Options) void {
if (step.target.toTarget().cpu.arch != .wasm32) { if (step.target.toTarget().cpu.arch != .wasm32) {
// TODO(build-system): pass system SDK options through
if (step.target_info.target.os.tag == .macos) deps.system_sdk.include(b, step, .{});
if (step.target.toTarget().isDarwin()) { if (step.target.toTarget().isDarwin()) {
// TODO(build-system): This cannot be imported with the Zig package manager
// error: TarUnsupportedFileType
//
// step.linkLibrary(b.dependency("xcode_frameworks", .{
// .target = step.target,
// .optimize = step.optimize,
// }).artifact("xcode-frameworks"));
// @import("xcode_frameworks").addPaths(step);
deps.xcode_frameworks.addPaths(step);
step.linkFramework("AudioToolbox"); step.linkFramework("AudioToolbox");
step.linkFramework("CoreFoundation"); step.linkFramework("CoreFoundation");
step.linkFramework("CoreAudio"); step.linkFramework("CoreAudio");