Skip to content

Commit bc37245

Browse files
SenryokuSenryoku
committed
Compiles with zig 0.15.1
1 parent ea4200e commit bc37245

File tree

3 files changed

+62
-53
lines changed

3 files changed

+62
-53
lines changed

‎build.zig‎

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,36 @@ pub fn build(b: *std.Build) void {
88
.root_source_file = b.path("src/zaudio.zig"),
99
});
1010

11-
const miniaudio = b.addStaticLibrary(.{
12-
.name = "miniaudio",
11+
const miniaudio = b.addModule("miniaudio", .{
1312
.target = target,
1413
.optimize = optimize,
1514
});
1615

17-
b.installArtifact(miniaudio);
16+
const miniaudio_lib = b.addLibrary(.{
17+
.name = "miniaudio",
18+
.root_module = miniaudio,
19+
.linkage = .static,
20+
});
21+
22+
b.installArtifact(miniaudio_lib);
1823

1924
miniaudio.addIncludePath(b.path("libs/miniaudio"));
20-
miniaudio.linkLibC();
25+
miniaudio_lib.linkLibC();
2126

2227
if (target.result.os.tag == .macos) {
2328
if (b.lazyDependency("system_sdk", .{})) |system_sdk| {
24-
miniaudio.addFrameworkPath(system_sdk.path("macos12/System/Library/Frameworks"));
25-
miniaudio.addSystemIncludePath(system_sdk.path("macos12/usr/include"));
26-
miniaudio.addLibraryPath(system_sdk.path("macos12/usr/lib"));
29+
miniaudio_lib.addFrameworkPath(system_sdk.path("macos12/System/Library/Frameworks"));
30+
miniaudio_lib.addSystemIncludePath(system_sdk.path("macos12/usr/include"));
31+
miniaudio_lib.addLibraryPath(system_sdk.path("macos12/usr/lib"));
2732
}
28-
miniaudio.linkFramework("CoreAudio");
29-
miniaudio.linkFramework("CoreFoundation");
30-
miniaudio.linkFramework("AudioUnit");
31-
miniaudio.linkFramework("AudioToolbox");
33+
miniaudio_lib.linkFramework("CoreAudio");
34+
miniaudio_lib.linkFramework("CoreFoundation");
35+
miniaudio_lib.linkFramework("AudioUnit");
36+
miniaudio_lib.linkFramework("AudioToolbox");
3237
} else if (target.result.os.tag == .linux) {
33-
miniaudio.linkSystemLibrary("pthread");
34-
miniaudio.linkSystemLibrary("m");
35-
miniaudio.linkSystemLibrary("dl");
38+
miniaudio_lib.linkSystemLibrary("pthread");
39+
miniaudio_lib.linkSystemLibrary("m");
40+
miniaudio_lib.linkSystemLibrary("dl");
3641
}
3742

3843
miniaudio.addCSourceFile(.{
@@ -56,15 +61,19 @@ pub fn build(b: *std.Build) void {
5661

5762
const test_step = b.step("test", "Run zaudio tests");
5863

59-
const tests = b.addTest(.{
60-
.name = "zaudio-tests",
64+
const test_module = b.addModule("test", .{
6165
.root_source_file = b.path("src/zaudio.zig"),
6266
.target = target,
6367
.optimize = optimize,
6468
});
69+
70+
const tests = b.addTest(.{
71+
.name = "zaudio-tests",
72+
.root_module = test_module,
73+
});
6574
b.installArtifact(tests);
6675

67-
tests.linkLibrary(miniaudio);
76+
tests.linkLibrary(miniaudio_lib);
6877

6978
test_step.dependOn(&b.addRunArtifact(tests).step);
7079
}

‎build.zig.zon‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
.name = .zaudio,
33
.fingerprint = 0xc5244e8cd6bdcffc, // Changing this has security and trust implications.
44
.version = "0.11.0-dev",
5-
.minimum_zig_version = "0.14.0",
5+
.minimum_zig_version = "0.15.1",
66
.paths = .{
77
"build.zig",
88
"build.zig.zon",

‎src/zaudio.zig‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub fn init(allocator: std.mem.Allocator) void {
1717

1818
zaudioMemInit();
1919
}
20-
extern fn zaudioMemInit() callconv(.C) void;
20+
extern fn zaudioMemInit() callconv(.c) void;
2121

2222
pub fn deinit() void {
2323
assert(mem_allocator != null);
@@ -392,15 +392,15 @@ pub const MonoExpansionMode = enum(u32) {
392392
pub const AllocationCallbacks = extern struct {
393393
user_data: ?*anyopaque,
394394

395-
onMalloc: ?*const fn (len: usize, user_data: ?*anyopaque) callconv(.C) ?*anyopaque,
395+
onMalloc: ?*const fn (len: usize, user_data: ?*anyopaque) callconv(.c) ?*anyopaque,
396396

397397
onRealloc: ?*const fn (
398398
ptr: ?*anyopaque,
399399
len: usize,
400400
user_data: ?*anyopaque,
401-
) callconv(.C) ?*anyopaque,
401+
) callconv(.c) ?*anyopaque,
402402

403-
onFree: ?*const fn (ptr: ?*anyopaque, user_data: ?*anyopaque) callconv(.C) void,
403+
onFree: ?*const fn (ptr: ?*anyopaque, user_data: ?*anyopaque) callconv(.c) void,
404404
};
405405

406406
pub const Bool32 = enum(u32) {
@@ -439,14 +439,14 @@ pub const Vfs = extern struct {
439439
size_in_bytes: usize,
440440
};
441441

442-
on_open: ?*const fn (self: *Vfs, file_path: [*:0]const u8, mode: OpenMode, handle: *FileHandle) callconv(.C) Result,
443-
on_openw: ?*const fn (self: *Vfs, file_path: [*:0]const u32, mode: OpenMode, handle: *FileHandle) callconv(.C) Result,
444-
on_close: ?*const fn (self: *Vfs, handle: FileHandle) callconv(.C) Result,
445-
on_read: ?*const fn (self: *Vfs, handle: FileHandle, dst: [*]u8, size: usize, bytes_read: *usize) callconv(.C) Result,
446-
on_write: ?*const fn (self: *Vfs, handle: FileHandle, src: [*]const u8, size: usize, bytes_written: *usize) callconv(.C) Result,
447-
on_seek: ?*const fn (self: *Vfs, handle: FileHandle, offset: i64, origin: SeekOrigin) callconv(.C) Result,
448-
on_tell: ?*const fn (self: *Vfs, handle: FileHandle, offset: *i64) callconv(.C) Result,
449-
on_info: ?*const fn (self: *Vfs, handle: FileHandle, info: *FileInfo) callconv(.C) Result,
442+
on_open: ?*const fn (self: *Vfs, file_path: [*:0]const u8, mode: OpenMode, handle: *FileHandle) callconv(.c) Result,
443+
on_openw: ?*const fn (self: *Vfs, file_path: [*:0]const u32, mode: OpenMode, handle: *FileHandle) callconv(.c) Result,
444+
on_close: ?*const fn (self: *Vfs, handle: FileHandle) callconv(.c) Result,
445+
on_read: ?*const fn (self: *Vfs, handle: FileHandle, dst: [*]u8, size: usize, bytes_read: *usize) callconv(.c) Result,
446+
on_write: ?*const fn (self: *Vfs, handle: FileHandle, src: [*]const u8, size: usize, bytes_written: *usize) callconv(.c) Result,
447+
on_seek: ?*const fn (self: *Vfs, handle: FileHandle, offset: i64, origin: SeekOrigin) callconv(.c) Result,
448+
on_tell: ?*const fn (self: *Vfs, handle: FileHandle, offset: *i64) callconv(.c) Result,
449+
on_info: ?*const fn (self: *Vfs, handle: FileHandle, info: *FileInfo) callconv(.c) Result,
450450
};
451451

452452
pub const Context = opaque {
@@ -469,7 +469,7 @@ pub const DataSourceBase = extern struct {
469469
loop_end_in_frames: u64,
470470
p_current: *DataSource,
471471
p_next: *DataSource,
472-
onGetNext: ?*const fn (*DataSource) callconv(.C) void,
472+
onGetNext: ?*const fn (*DataSource) callconv(.c) void,
473473
is_looping: Bool32,
474474
};
475475

@@ -505,9 +505,9 @@ pub const DataSource = opaque {
505505
frames_out: ?*anyopaque,
506506
frame_count: u64,
507507
frames_read: *u64,
508-
) callconv(.C) Result,
508+
) callconv(.c) Result,
509509

510-
onSeek: ?*const fn (ds: *DataSource, frame_index: u64) callconv(.C) Result,
510+
onSeek: ?*const fn (ds: *DataSource, frame_index: u64) callconv(.c) Result,
511511

512512
onGetDataFormat: ?*const fn (
513513
ds: *DataSource,
@@ -516,13 +516,13 @@ pub const DataSource = opaque {
516516
sample_rate: ?*u32,
517517
channel_map: ?[*]Channel,
518518
channel_map_cap: usize,
519-
) callconv(.C) Result,
519+
) callconv(.c) Result,
520520

521-
onGetCursor: ?*const fn (ds: *DataSource, cursor: ?*u64) callconv(.C) Result,
521+
onGetCursor: ?*const fn (ds: *DataSource, cursor: ?*u64) callconv(.c) Result,
522522

523-
onGetLength: ?*const fn (ds: *DataSource, length: ?*u64) callconv(.C) Result,
523+
onGetLength: ?*const fn (ds: *DataSource, length: ?*u64) callconv(.c) Result,
524524

525-
onSetLooping: ?*const fn (ds: *DataSource, is_looping: Bool32) callconv(.C) Result,
525+
onSetLooping: ?*const fn (ds: *DataSource, is_looping: Bool32) callconv(.c) Result,
526526

527527
flags: Flags,
528528
};
@@ -763,13 +763,13 @@ pub const Node = opaque {
763763
frame_count_in: ?*u32,
764764
frames_out: *[*]f32,
765765
frame_count_out: *u32,
766-
) callconv(.C) void,
766+
) callconv(.c) void,
767767

768768
onGetRequiredInputFrameCount: ?*const fn (
769769
node: *Node,
770770
output_frame_count: u32,
771771
input_frame_count: *u32,
772-
) callconv(.C) Result,
772+
) callconv(.c) Result,
773773

774774
input_bus_count: u8,
775775
output_bus_count: u8,
@@ -1721,13 +1721,13 @@ pub const Device = opaque {
17211721
output: ?*anyopaque,
17221722
input: ?*const anyopaque,
17231723
frame_count: u32,
1724-
) callconv(.C) void;
1724+
) callconv(.c) void;
17251725

17261726
pub const NotificationProc = *const fn (
17271727
*const anyopaque, // TODO: Should be `*const ma_device_notification`.
1728-
) callconv(.C) void;
1728+
) callconv(.c) void;
17291729

1730-
pub const StopProc = *const fn (device: *Device) callconv(.C) void;
1730+
pub const StopProc = *const fn (device: *Device) callconv(.c) void;
17311731

17321732
pub const Id = extern union {
17331733
wasapi: [64]i32,
@@ -1794,7 +1794,7 @@ pub const Engine = opaque {
17941794
user_data: ?*anyopaque,
17951795
frames_out: [*]f32,
17961796
frame_count: u64,
1797-
) callconv(.C) void;
1797+
) callconv(.c) void;
17981798

17991799
pub fn create(config: ?Config) Error!*Engine {
18001800
var handle: ?*Engine = null;
@@ -2423,7 +2423,7 @@ pub const Sound = opaque {
24232423
pub const EndProc = *const fn (
24242424
user_data: ?*anyopaque,
24252425
sound: *Sound,
2426-
) callconv(.C) void;
2426+
) callconv(.c) void;
24272427
};
24282428
//--------------------------------------------------------------------------------------------------
24292429
//
@@ -2710,15 +2710,15 @@ var mem_allocations: ?std.AutoHashMap(usize, usize) = null;
27102710
var mem_mutex: std.Thread.Mutex = .{};
27112711
const mem_alignment = 16;
27122712

2713-
extern var zaudioMallocPtr: ?*const fn (size: usize, _: ?*anyopaque) callconv(.C) ?*anyopaque;
2713+
extern var zaudioMallocPtr: ?*const fn (size: usize, _: ?*anyopaque) callconv(.c) ?*anyopaque;
27142714

2715-
fn zaudioMalloc(size: usize, _: ?*anyopaque) callconv(.C) ?*anyopaque {
2715+
fn zaudioMalloc(size: usize, _: ?*anyopaque) callconv(.c) ?*anyopaque {
27162716
mem_mutex.lock();
27172717
defer mem_mutex.unlock();
27182718

27192719
const mem = mem_allocator.?.alignedAlloc(
27202720
u8,
2721-
mem_alignment,
2721+
.fromByteUnits(mem_alignment),
27222722
size,
27232723
) catch @panic("zaudio: out of memory");
27242724

@@ -2727,9 +2727,9 @@ fn zaudioMalloc(size: usize, _: ?*anyopaque) callconv(.C) ?*anyopaque {
27272727
return mem.ptr;
27282728
}
27292729

2730-
extern var zaudioReallocPtr: ?*const fn (ptr: ?*anyopaque, size: usize, _: ?*anyopaque) callconv(.C) ?*anyopaque;
2730+
extern var zaudioReallocPtr: ?*const fn (ptr: ?*anyopaque, size: usize, _: ?*anyopaque) callconv(.c) ?*anyopaque;
27312731

2732-
fn zaudioRealloc(ptr: ?*anyopaque, size: usize, _: ?*anyopaque) callconv(.C) ?*anyopaque {
2732+
fn zaudioRealloc(ptr: ?*anyopaque, size: usize, _: ?*anyopaque) callconv(.c) ?*anyopaque {
27332733
mem_mutex.lock();
27342734
defer mem_mutex.unlock();
27352735

@@ -2751,9 +2751,9 @@ fn zaudioRealloc(ptr: ?*anyopaque, size: usize, _: ?*anyopaque) callconv(.C) ?*a
27512751
return new_mem.ptr;
27522752
}
27532753

2754-
extern var zaudioFreePtr: ?*const fn (maybe_ptr: ?*anyopaque, _: ?*anyopaque) callconv(.C) void;
2754+
extern var zaudioFreePtr: ?*const fn (maybe_ptr: ?*anyopaque, _: ?*anyopaque) callconv(.c) void;
27552755

2756-
fn zaudioFree(maybe_ptr: ?*anyopaque, _: ?*anyopaque) callconv(.C) void {
2756+
fn zaudioFree(maybe_ptr: ?*anyopaque, _: ?*anyopaque) callconv(.c) void {
27572757
if (maybe_ptr) |ptr| {
27582758
mem_mutex.lock();
27592759
defer mem_mutex.unlock();
@@ -2963,7 +2963,7 @@ test "zaudio.audio_buffer" {
29632963
defer deinit();
29642964

29652965
var samples = try std.ArrayList(f32).initCapacity(std.testing.allocator, 1000);
2966-
defer samples.deinit();
2966+
defer samples.deinit(std.testing.allocator);
29672967

29682968
var prng = std.Random.DefaultPrng.init(0);
29692969
const rand = prng.random();
@@ -2992,7 +2992,7 @@ test "zaudio.audio_buffer" {
29922992
sound.setLooping(true);
29932993
try sound.start();
29942994

2995-
std.time.sleep(1e8);
2995+
std.Thread.sleep(1e8);
29962996
}
29972997

29982998
test {

0 commit comments

Comments
 (0)