ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 07:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

vendor/miniaudio: fix import for macos

Browse Source 
Using `system:miniaudio` is suboptimal, we already provide the
`Makefile` that builds the `lib/miniaudio.a` and this works on MacOS.
This PR makes linking with that library the default.
This commit is contained in:
Laytan Laats
2024-01-13 21:14:02 +01:00
parent 5e7b031a1d
commit 5896469f3b
16 changed files with 16 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vendor/miniaudio/common.odin
Vendored
+1 -3
View File
@@ -10,10 +10,8 @@ when MINIAUDIO_SHARED {
when ODIN_OS == .Windows { when ODIN_OS == .Windows {
foreign import lib "lib/miniaudio.lib" foreign import lib "lib/miniaudio.lib"
} else when ODIN_OS == .Linux {
foreign import lib "lib/miniaudio.a"
} else { } else {
foreign import lib "system:miniaudio" foreign import lib "lib/miniaudio.a"
} }
handle :: distinct rawptr handle :: distinct rawptr
vendor/miniaudio/data_conversion.odin
Vendored
+1 -3
View File
@@ -4,10 +4,8 @@ import "core:c"
when ODIN_OS == .Windows { when ODIN_OS == .Windows {
foreign import lib "lib/miniaudio.lib" foreign import lib "lib/miniaudio.lib"
} else when ODIN_OS == .Linux {
foreign import lib "lib/miniaudio.a"
} else { } else {
foreign import lib "system:miniaudio" foreign import lib "lib/miniaudio.a"
} }
/************************************************************************************************************************************************************ /************************************************************************************************************************************************************
vendor/miniaudio/decoding.odin
Vendored
+1 -3
View File
@@ -4,10 +4,8 @@ import "core:c"
when ODIN_OS == .Windows { when ODIN_OS == .Windows {
foreign import lib "lib/miniaudio.lib" foreign import lib "lib/miniaudio.lib"
} else when ODIN_OS == .Linux {
foreign import lib "lib/miniaudio.a"
} else { } else {
foreign import lib "system:miniaudio" foreign import lib "lib/miniaudio.a"
} }
/************************************************************************************************************************************************************ /************************************************************************************************************************************************************
vendor/miniaudio/device_io_procs.odin
Vendored
+1 -3
View File
@@ -2,10 +2,8 @@ package miniaudio
when ODIN_OS == .Windows { when ODIN_OS == .Windows {
foreign import lib "lib/miniaudio.lib" foreign import lib "lib/miniaudio.lib"
} else when ODIN_OS == .Linux {
foreign import lib "lib/miniaudio.a"
} else { } else {
foreign import lib "system:miniaudio" foreign import lib "lib/miniaudio.a"
} }
import "core:c" import "core:c"
vendor/miniaudio/effects.odin
Vendored
+1 -3
View File
@@ -4,10 +4,8 @@ import c "core:c/libc"
when ODIN_OS == .Windows { when ODIN_OS == .Windows {
foreign import lib "lib/miniaudio.lib" foreign import lib "lib/miniaudio.lib"
} else when ODIN_OS == .Linux {
foreign import lib "lib/miniaudio.a"
} else { } else {
foreign import lib "system:miniaudio" foreign import lib "lib/miniaudio.a"
} }
/* /*
vendor/miniaudio/encoding.odin
Vendored
+1 -3
View File
@@ -4,10 +4,8 @@ import "core:c"
when ODIN_OS == .Windows { when ODIN_OS == .Windows {
foreign import lib "lib/miniaudio.lib" foreign import lib "lib/miniaudio.lib"
} else when ODIN_OS == .Linux {
foreign import lib "lib/miniaudio.a"
} else { } else {
foreign import lib "system:miniaudio" foreign import lib "lib/miniaudio.a"
} }
/************************************************************************************************************************************************************ /************************************************************************************************************************************************************
vendor/miniaudio/engine.odin
Vendored
+1 -3
View File
@@ -4,10 +4,8 @@ import "core:c"
when ODIN_OS == .Windows { when ODIN_OS == .Windows {
foreign import lib "lib/miniaudio.lib" foreign import lib "lib/miniaudio.lib"
} else when ODIN_OS == .Linux {
foreign import lib "lib/miniaudio.a"
} else { } else {
foreign import lib "system:miniaudio" foreign import lib "lib/miniaudio.a"
} }
/************************************************************************************************************************************************************ /************************************************************************************************************************************************************
vendor/miniaudio/filtering.odin
Vendored
+1 -3
View File
@@ -4,10 +4,8 @@ import c "core:c/libc"
when ODIN_OS == .Windows { when ODIN_OS == .Windows {
foreign import lib "lib/miniaudio.lib" foreign import lib "lib/miniaudio.lib"
} else when ODIN_OS == .Linux {
foreign import lib "lib/miniaudio.a"
} else { } else {
foreign import lib "system:miniaudio" foreign import lib "lib/miniaudio.a"
} }
/************************************************************************************************************************************************************** /**************************************************************************************************************************************************************
vendor/miniaudio/generation.odin
Vendored
+1 -3
View File
@@ -4,10 +4,8 @@ import "core:c"
when ODIN_OS == .Windows { when ODIN_OS == .Windows {
foreign import lib "lib/miniaudio.lib" foreign import lib "lib/miniaudio.lib"
} else when ODIN_OS == .Linux {
foreign import lib "lib/miniaudio.a"
} else { } else {
foreign import lib "system:miniaudio" foreign import lib "lib/miniaudio.a"
} }
waveform_type :: enum c.int { waveform_type :: enum c.int {
vendor/miniaudio/job_queue.odin
Vendored
+1 -3
View File
@@ -4,10 +4,8 @@ import c "core:c/libc"
when ODIN_OS == .Windows { when ODIN_OS == .Windows {
foreign import lib "lib/miniaudio.lib" foreign import lib "lib/miniaudio.lib"
} else when ODIN_OS == .Linux {
foreign import lib "lib/miniaudio.a"
} else { } else {
foreign import lib "system:miniaudio" foreign import lib "lib/miniaudio.a"
} }
/* /*
vendor/miniaudio/logging.odin
Vendored
+1 -3
View File
@@ -4,10 +4,8 @@ import c "core:c/libc"
when ODIN_OS == .Windows { when ODIN_OS == .Windows {
foreign import lib "lib/miniaudio.lib" foreign import lib "lib/miniaudio.lib"
} else when ODIN_OS == .Linux {
foreign import lib "lib/miniaudio.a"
} else { } else {
foreign import lib "system:miniaudio" foreign import lib "lib/miniaudio.a"
} }
MAX_LOG_CALLBACKS :: 4 MAX_LOG_CALLBACKS :: 4
vendor/miniaudio/node_graph.odin
Vendored
+1 -3
View File
@@ -4,10 +4,8 @@ import "core:c"
when ODIN_OS == .Windows { when ODIN_OS == .Windows {
foreign import lib "lib/miniaudio.lib" foreign import lib "lib/miniaudio.lib"
} else when ODIN_OS == .Linux {
foreign import lib "lib/miniaudio.a"
} else { } else {
foreign import lib "system:miniaudio" foreign import lib "lib/miniaudio.a"
} }
/************************************************************************************************************************************************************ /************************************************************************************************************************************************************
vendor/miniaudio/resource_manager.odin
Vendored
+1 -3
View File
@@ -4,10 +4,8 @@ import "core:c"
when ODIN_OS == .Windows { when ODIN_OS == .Windows {
foreign import lib "lib/miniaudio.lib" foreign import lib "lib/miniaudio.lib"
} else when ODIN_OS == .Linux {
foreign import lib "lib/miniaudio.a"
} else { } else {
foreign import lib "system:miniaudio" foreign import lib "lib/miniaudio.a"
} }
/************************************************************************************************************************************************************ /************************************************************************************************************************************************************
vendor/miniaudio/synchronization.odin
Vendored
+1 -3
View File
@@ -2,10 +2,8 @@ package miniaudio
when ODIN_OS == .Windows { when ODIN_OS == .Windows {
foreign import lib "lib/miniaudio.lib" foreign import lib "lib/miniaudio.lib"
} else when ODIN_OS == .Linux {
foreign import lib "lib/miniaudio.a"
} else { } else {
foreign import lib "system:miniaudio" foreign import lib "lib/miniaudio.a"
} }
@(default_calling_convention="c", link_prefix="ma_") @(default_calling_convention="c", link_prefix="ma_")
vendor/miniaudio/utilities.odin
Vendored
+1 -3
View File
@@ -4,10 +4,8 @@ import c "core:c/libc"
when ODIN_OS == .Windows { when ODIN_OS == .Windows {
foreign import lib "lib/miniaudio.lib" foreign import lib "lib/miniaudio.lib"
} else when ODIN_OS == .Linux {
foreign import lib "lib/miniaudio.a"
} else { } else {
foreign import lib "system:miniaudio" foreign import lib "lib/miniaudio.a"
} }
@(default_calling_convention="c", link_prefix="ma_") @(default_calling_convention="c", link_prefix="ma_")
vendor/miniaudio/vfs.odin
Vendored
+1 -3
View File
@@ -4,10 +4,8 @@ import "core:c"
when ODIN_OS == .Windows { when ODIN_OS == .Windows {
foreign import lib "lib/miniaudio.lib" foreign import lib "lib/miniaudio.lib"
} else when ODIN_OS == .Linux {
foreign import lib "lib/miniaudio.a"
} else { } else {
foreign import lib "system:miniaudio" foreign import lib "lib/miniaudio.a"
} }
/************************************************************************************************************************************************************ /************************************************************************************************************************************************************