From 725f68726445d8798c55bfd9aac97e0191d1c5f0 Mon Sep 17 00:00:00 2001 From: ekliot Date: Tue, 19 Aug 2025 10:13:00 -0600 Subject: [PATCH 1/2] fixing miniaudio wasm target build issues --- vendor/miniaudio/common_unix.odin | 2 +- vendor/miniaudio/common_windows.odin | 6 ------ vendor/miniaudio/logging.odin | 6 +++--- 3 files changed, 4 insertions(+), 10 deletions(-) delete mode 100644 vendor/miniaudio/common_windows.odin diff --git a/vendor/miniaudio/common_unix.odin b/vendor/miniaudio/common_unix.odin index 1c015840495..aa00b90428f 100644 --- a/vendor/miniaudio/common_unix.odin +++ b/vendor/miniaudio/common_unix.odin @@ -1,4 +1,4 @@ -#+build !windows +#+build linux, darwin, netbsd, openbsd, freebsd, haiku package miniaudio import "core:sys/posix" diff --git a/vendor/miniaudio/common_windows.odin b/vendor/miniaudio/common_windows.odin deleted file mode 100644 index 013fc56f954..00000000000 --- a/vendor/miniaudio/common_windows.odin +++ /dev/null @@ -1,6 +0,0 @@ -package miniaudio - -thread :: distinct rawptr -mutex :: distinct rawptr -event :: distinct rawptr -semaphore :: distinct rawptr diff --git a/vendor/miniaudio/logging.odin b/vendor/miniaudio/logging.odin index afddf8e685c..135c6a9b1cc 100644 --- a/vendor/miniaudio/logging.odin +++ b/vendor/miniaudio/logging.odin @@ -1,6 +1,6 @@ package miniaudio -import "core:c/libc" +import "core:c" foreign import lib { LIB } @@ -48,12 +48,12 @@ log :: struct { @(default_calling_convention="c", link_prefix="ma_") foreign lib { log_callback_init :: proc(onLog: log_callback_proc, pUserData: rawptr) -> log_callback --- - + log_init :: proc(pAllocationCallbacks: ^allocation_callbacks, pLog: ^log) -> result --- log_uninit :: proc(pLog: ^log) --- log_register_callback :: proc(pLog: ^log, callback: log_callback) -> result --- log_unregister_callback :: proc(pLog: ^log, callback: log_callback) -> result --- log_post :: proc(pLog: ^log, level: u32, pMessage: cstring) -> result --- - log_postv :: proc(pLog: ^log, level: u32, pFormat: cstring, args: libc.va_list) -> result --- + log_postv :: proc(pLog: ^log, level: u32, pFormat: cstring, args: c.va_list) -> result --- log_postf :: proc(pLog: ^log, level: u32, pFormat: cstring, #c_vararg args: ..any) -> result --- } From 7ff4b2f4155ff4a93b53aa7a10fe2d2505f75739 Mon Sep 17 00:00:00 2001 From: ekliot Date: Tue, 19 Aug 2025 10:14:03 -0600 Subject: [PATCH 2/2] adding file --- vendor/miniaudio/common_threading.odin | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 vendor/miniaudio/common_threading.odin diff --git a/vendor/miniaudio/common_threading.odin b/vendor/miniaudio/common_threading.odin new file mode 100644 index 00000000000..66a552e9a26 --- /dev/null +++ b/vendor/miniaudio/common_threading.odin @@ -0,0 +1,12 @@ +#+build !linux +#+build !darwin +#+build !netbsd +#+build !openbsd +#+build !freebsd +#+build !haiku +package miniaudio + +thread :: distinct rawptr +mutex :: distinct rawptr +event :: distinct rawptr +semaphore :: distinct rawptr