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 // error: TarUnsupportedFileType
.xcode_frameworks = @import("libs/gpu-dawn/libs/xcode-frameworks/build.zig"), .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(.{ pub const gpu_dawn = @import("libs/gpu-dawn/build.zig").Sdk(.{
// TODO(build-system): This cannot be imported with the Zig package manager // TODO(build-system): This cannot be imported with the Zig package manager
// error: TarUnsupportedFileType // error: TarUnsupportedFileType

4
build.zig.zon
View file

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

173
libs/sysaudio/build.zig
View file

@ -3,10 +3,9 @@ const std = @import("std");
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 = Sdk();
const test_step = b.step("test", "Run library tests"); 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{ inline for ([_][]const u8{
"sine-wave", "sine-wave",
@ -17,8 +16,8 @@ pub fn build(b: *std.Build) void {
.target = target, .target = target,
.optimize = optimize, .optimize = optimize,
}); });
example_exe.addModule("sysaudio", sysaudio.module(b, optimize, target)); example_exe.addModule("sysaudio", module(b, optimize, target));
sysaudio.link(b, example_exe, .{}); link(b, example_exe, .{});
b.installArtifact(example_exe); b.installArtifact(example_exe);
const example_compile_step = b.step("example-" ++ example, "Compile '" ++ example ++ "' example"); const example_compile_step = b.step("example-" ++ example, "Compile '" ++ example ++ "' example");
@ -35,98 +34,94 @@ pub fn build(b: *std.Build) void {
} }
} }
pub fn Sdk() type { pub const Options = struct {
return struct { install_libs: bool = false,
pub const Options = struct { };
install_libs: bool = false,
};
var _module: ?*std.build.Module = null; var _module: ?*std.build.Module = null;
pub fn module(b: *std.Build, optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget) *std.build.Module { pub fn module(b: *std.Build, optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget) *std.build.Module {
if (_module) |m| return m; if (_module) |m| return m;
if (target.getCpuArch() == .wasm32) { if (target.getCpuArch() == .wasm32) {
const sysjs_dep = b.dependency("mach_sysjs", .{ const sysjs_dep = b.dependency("mach_sysjs", .{
.target = target, .target = target,
.optimize = optimize, .optimize = optimize,
}); });
_module = b.createModule(.{ _module = b.createModule(.{
.source_file = .{ .path = sdkPath("/src/main.zig") }, .source_file = .{ .path = sdkPath("/src/main.zig") },
.dependencies = &.{ .dependencies = &.{
.{ .name = "sysjs", .module = sysjs_dep.module("mach-sysjs") }, .{ .name = "sysjs", .module = sysjs_dep.module("mach-sysjs") },
}, },
}); });
} else { } else {
_module = b.createModule(.{ _module = b.createModule(.{
.source_file = .{ .path = sdkPath("/src/main.zig") }, .source_file = .{ .path = sdkPath("/src/main.zig") },
}); });
} }
return _module.?; return _module.?;
}
pub fn testStep(b: *std.Build, optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget) *std.build.RunStep {
const main_tests = b.addTest(.{
.name = "sysaudio-tests",
.root_source_file = .{ .path = sdkPath("/src/main.zig") },
.target = target,
.optimize = optimize,
});
link(b, main_tests, .{});
b.installArtifact(main_tests);
return b.addRunArtifact(main_tests);
}
pub fn link(b: *std.Build, step: *std.build.CompileStep, options: Options) void {
if (step.target.toTarget().cpu.arch != .wasm32) {
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);
xcode_frameworks.addPaths(b, step);
step.linkFramework("AudioToolbox");
step.linkFramework("CoreFoundation");
step.linkFramework("CoreAudio");
} else if (step.target.toTarget().os.tag == .linux) {
step.linkLibrary(b.dependency("linux_audio_headers", .{
.target = step.target,
.optimize = step.optimize,
}).artifact("linux-audio-headers"));
step.addCSourceFile(sdkPath("/src/pipewire/sysaudio.c"), &.{"-std=gnu99"});
step.linkLibC();
} }
}
if (options.install_libs) {
b.installArtifact(step);
}
}
pub fn testStep(b: *std.Build, optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget) *std.build.RunStep { fn ensureDependencySubmodule(allocator: std.mem.Allocator, path: []const u8) !void {
const main_tests = b.addTest(.{ if (std.process.getEnvVarOwned(allocator, "NO_ENSURE_SUBMODULES")) |no_ensure_submodules| {
.name = "sysaudio-tests", defer allocator.free(no_ensure_submodules);
.root_source_file = .{ .path = sdkPath("/src/main.zig") }, if (std.mem.eql(u8, no_ensure_submodules, "true")) return;
.target = target, } else |_| {}
.optimize = optimize, var child = std.ChildProcess.init(&.{ "git", "submodule", "update", "--init", path }, allocator);
}); child.cwd = sdkPath("/");
link(b, main_tests, .{}); child.stderr = std.io.getStdErr();
b.installArtifact(main_tests); child.stdout = std.io.getStdOut();
return b.addRunArtifact(main_tests);
}
pub fn link(b: *std.Build, step: *std.build.CompileStep, options: Options) void { _ = try child.spawnAndWait();
if (step.target.toTarget().cpu.arch != .wasm32) { }
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);
xcode_frameworks.addPaths(b, step);
step.linkFramework("AudioToolbox"); fn sdkPath(comptime suffix: []const u8) []const u8 {
step.linkFramework("CoreFoundation"); if (suffix[0] != '/') @compileError("suffix must be an absolute path");
step.linkFramework("CoreAudio"); return comptime blk: {
} else if (step.target.toTarget().os.tag == .linux) { const root_dir = std.fs.path.dirname(@src().file) orelse ".";
step.linkLibrary(b.dependency("linux_audio_headers", .{ break :blk root_dir ++ suffix;
.target = step.target,
.optimize = step.optimize,
}).artifact("linux-audio-headers"));
step.addCSourceFile(sdkPath("/src/pipewire/sysaudio.c"), &.{"-std=gnu99"});
step.linkLibC();
}
}
if (options.install_libs) {
b.installArtifact(step);
}
}
fn ensureDependencySubmodule(allocator: std.mem.Allocator, path: []const u8) !void {
if (std.process.getEnvVarOwned(allocator, "NO_ENSURE_SUBMODULES")) |no_ensure_submodules| {
defer allocator.free(no_ensure_submodules);
if (std.mem.eql(u8, no_ensure_submodules, "true")) return;
} else |_| {}
var child = std.ChildProcess.init(&.{ "git", "submodule", "update", "--init", path }, allocator);
child.cwd = sdkPath("/");
child.stderr = std.io.getStdErr();
child.stdout = std.io.getStdOut();
_ = try child.spawnAndWait();
}
fn sdkPath(comptime suffix: []const u8) []const u8 {
if (suffix[0] != '/') @compileError("suffix must be an absolute path");
return comptime blk: {
const root_dir = std.fs.path.dirname(@src().file) orelse ".";
break :blk root_dir ++ suffix;
};
}
}; };
} }