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

sysaudio: eliminate Sdk type

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2023-07-06 23:38:49 -07:00
parent 78590b8950
commit 0a20ba3169
3 changed files with 89 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build.zig
View file

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

4
build.zig.zon
View file

@ -26,6 +26,10 @@
.url = "https://github.com/hexops/mach-basisu/archive/831de64fe2d7933d6418440f8558444ca32eeca5.tar.gz",
.hash = "1220ead8a15f606d6f0f853fe401460dfe18811e3d5d1aa7e808be825e44f17f0dc3",
},
.mach_sysaudio = .{
.url = "https://github.com/hexops/mach-sysaudio/archive/bc03624694ddf3a7d348efdeccf82404eb019236.tar.gz",
.hash = "12203830507ce345848f27ffd27369e726c35ce115edb66f9ba9ee524d8a46c0a87a",
},
.direct3d_headers = .{
.url = "https://github.com/hexops/direct3d-headers/archive/773dce3f079eecdccc7c71d1318a0741649d568b.tar.gz",
.hash = "12200d2155216c5eb5f111282cd355b5433cad6a68fd040294e695149cba329f7c12",

11
libs/sysaudio/build.zig
View file

@ -3,10 +3,9 @@ const std = @import("std");
pub fn build(b: *std.Build) void {
const optimize = b.standardOptimizeOption(.{});
const target = b.standardTargetOptions(.{});
const sysaudio = Sdk();
const test_step = b.step("test", "Run library tests");
test_step.dependOn(&sysaudio.testStep(b, optimize, target).step);
test_step.dependOn(&testStep(b, optimize, target).step);
inline for ([_][]const u8{
"sine-wave",
@ -17,8 +16,8 @@ pub fn build(b: *std.Build) void {
.target = target,
.optimize = optimize,
});
example_exe.addModule("sysaudio", sysaudio.module(b, optimize, target));
sysaudio.link(b, example_exe, .{});
example_exe.addModule("sysaudio", module(b, optimize, target));
link(b, example_exe, .{});
b.installArtifact(example_exe);
const example_compile_step = b.step("example-" ++ example, "Compile '" ++ example ++ "' example");
@ -35,8 +34,6 @@ pub fn build(b: *std.Build) void {
}
}
pub fn Sdk() type {
return struct {
pub const Options = struct {
install_libs: bool = false,
};
@ -127,8 +124,6 @@ pub fn Sdk() type {
break :blk root_dir ++ suffix;
};
}
};
}
// TODO(build-system): This is a workaround that we copy anywhere xcode_frameworks needs to be used.
// With the Zig package manager, it should be possible to remove this entirely and instead just