mirror of
https://github.com/Ed94/Odin.git
synced 2026-06-17 11:22:22 -07:00
vendor/miniaudio: fix import for macos
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:
Vendored
+1
-3
@@ -10,10 +10,8 @@ when MINIAUDIO_SHARED {
|
||||
|
||||
when ODIN_OS == .Windows {
|
||||
foreign import lib "lib/miniaudio.lib"
|
||||
} else when ODIN_OS == .Linux {
|
||||
foreign import lib "lib/miniaudio.a"
|
||||
} else {
|
||||
foreign import lib "system:miniaudio"
|
||||
foreign import lib "lib/miniaudio.a"
|
||||
}
|
||||
|
||||
handle :: distinct rawptr
|
||||
|
||||
+1
-3
@@ -4,10 +4,8 @@ import "core:c"
|
||||
|
||||
when ODIN_OS == .Windows {
|
||||
foreign import lib "lib/miniaudio.lib"
|
||||
} else when ODIN_OS == .Linux {
|
||||
foreign import lib "lib/miniaudio.a"
|
||||
} else {
|
||||
foreign import lib "system:miniaudio"
|
||||
foreign import lib "lib/miniaudio.a"
|
||||
}
|
||||
|
||||
/************************************************************************************************************************************************************
|
||||
|
||||
Vendored
+1
-3
@@ -4,10 +4,8 @@ import "core:c"
|
||||
|
||||
when ODIN_OS == .Windows {
|
||||
foreign import lib "lib/miniaudio.lib"
|
||||
} else when ODIN_OS == .Linux {
|
||||
foreign import lib "lib/miniaudio.a"
|
||||
} else {
|
||||
foreign import lib "system:miniaudio"
|
||||
foreign import lib "lib/miniaudio.a"
|
||||
}
|
||||
|
||||
/************************************************************************************************************************************************************
|
||||
|
||||
+1
-3
@@ -2,10 +2,8 @@ package miniaudio
|
||||
|
||||
when ODIN_OS == .Windows {
|
||||
foreign import lib "lib/miniaudio.lib"
|
||||
} else when ODIN_OS == .Linux {
|
||||
foreign import lib "lib/miniaudio.a"
|
||||
} else {
|
||||
foreign import lib "system:miniaudio"
|
||||
foreign import lib "lib/miniaudio.a"
|
||||
}
|
||||
|
||||
import "core:c"
|
||||
|
||||
Vendored
+1
-3
@@ -4,10 +4,8 @@ import c "core:c/libc"
|
||||
|
||||
when ODIN_OS == .Windows {
|
||||
foreign import lib "lib/miniaudio.lib"
|
||||
} else when ODIN_OS == .Linux {
|
||||
foreign import lib "lib/miniaudio.a"
|
||||
} else {
|
||||
foreign import lib "system:miniaudio"
|
||||
foreign import lib "lib/miniaudio.a"
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
Vendored
+1
-3
@@ -4,10 +4,8 @@ import "core:c"
|
||||
|
||||
when ODIN_OS == .Windows {
|
||||
foreign import lib "lib/miniaudio.lib"
|
||||
} else when ODIN_OS == .Linux {
|
||||
foreign import lib "lib/miniaudio.a"
|
||||
} else {
|
||||
foreign import lib "system:miniaudio"
|
||||
foreign import lib "lib/miniaudio.a"
|
||||
}
|
||||
|
||||
/************************************************************************************************************************************************************
|
||||
|
||||
Vendored
+1
-3
@@ -4,10 +4,8 @@ import "core:c"
|
||||
|
||||
when ODIN_OS == .Windows {
|
||||
foreign import lib "lib/miniaudio.lib"
|
||||
} else when ODIN_OS == .Linux {
|
||||
foreign import lib "lib/miniaudio.a"
|
||||
} else {
|
||||
foreign import lib "system:miniaudio"
|
||||
foreign import lib "lib/miniaudio.a"
|
||||
}
|
||||
|
||||
/************************************************************************************************************************************************************
|
||||
|
||||
Vendored
+1
-3
@@ -4,10 +4,8 @@ import c "core:c/libc"
|
||||
|
||||
when ODIN_OS == .Windows {
|
||||
foreign import lib "lib/miniaudio.lib"
|
||||
} else when ODIN_OS == .Linux {
|
||||
foreign import lib "lib/miniaudio.a"
|
||||
} else {
|
||||
foreign import lib "system:miniaudio"
|
||||
foreign import lib "lib/miniaudio.a"
|
||||
}
|
||||
|
||||
/**************************************************************************************************************************************************************
|
||||
|
||||
Vendored
+1
-3
@@ -4,10 +4,8 @@ import "core:c"
|
||||
|
||||
when ODIN_OS == .Windows {
|
||||
foreign import lib "lib/miniaudio.lib"
|
||||
} else when ODIN_OS == .Linux {
|
||||
foreign import lib "lib/miniaudio.a"
|
||||
} else {
|
||||
foreign import lib "system:miniaudio"
|
||||
foreign import lib "lib/miniaudio.a"
|
||||
}
|
||||
|
||||
waveform_type :: enum c.int {
|
||||
|
||||
Vendored
+1
-3
@@ -4,10 +4,8 @@ import c "core:c/libc"
|
||||
|
||||
when ODIN_OS == .Windows {
|
||||
foreign import lib "lib/miniaudio.lib"
|
||||
} else when ODIN_OS == .Linux {
|
||||
foreign import lib "lib/miniaudio.a"
|
||||
} else {
|
||||
foreign import lib "system:miniaudio"
|
||||
foreign import lib "lib/miniaudio.a"
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
Vendored
+1
-3
@@ -4,10 +4,8 @@ import c "core:c/libc"
|
||||
|
||||
when ODIN_OS == .Windows {
|
||||
foreign import lib "lib/miniaudio.lib"
|
||||
} else when ODIN_OS == .Linux {
|
||||
foreign import lib "lib/miniaudio.a"
|
||||
} else {
|
||||
foreign import lib "system:miniaudio"
|
||||
foreign import lib "lib/miniaudio.a"
|
||||
}
|
||||
|
||||
MAX_LOG_CALLBACKS :: 4
|
||||
|
||||
Vendored
+1
-3
@@ -4,10 +4,8 @@ import "core:c"
|
||||
|
||||
when ODIN_OS == .Windows {
|
||||
foreign import lib "lib/miniaudio.lib"
|
||||
} else when ODIN_OS == .Linux {
|
||||
foreign import lib "lib/miniaudio.a"
|
||||
} else {
|
||||
foreign import lib "system:miniaudio"
|
||||
foreign import lib "lib/miniaudio.a"
|
||||
}
|
||||
|
||||
/************************************************************************************************************************************************************
|
||||
|
||||
+1
-3
@@ -4,10 +4,8 @@ import "core:c"
|
||||
|
||||
when ODIN_OS == .Windows {
|
||||
foreign import lib "lib/miniaudio.lib"
|
||||
} else when ODIN_OS == .Linux {
|
||||
foreign import lib "lib/miniaudio.a"
|
||||
} else {
|
||||
foreign import lib "system:miniaudio"
|
||||
foreign import lib "lib/miniaudio.a"
|
||||
}
|
||||
|
||||
/************************************************************************************************************************************************************
|
||||
|
||||
+1
-3
@@ -2,10 +2,8 @@ package miniaudio
|
||||
|
||||
when ODIN_OS == .Windows {
|
||||
foreign import lib "lib/miniaudio.lib"
|
||||
} else when ODIN_OS == .Linux {
|
||||
foreign import lib "lib/miniaudio.a"
|
||||
} else {
|
||||
foreign import lib "system:miniaudio"
|
||||
foreign import lib "lib/miniaudio.a"
|
||||
}
|
||||
|
||||
@(default_calling_convention="c", link_prefix="ma_")
|
||||
|
||||
Vendored
+1
-3
@@ -4,10 +4,8 @@ import c "core:c/libc"
|
||||
|
||||
when ODIN_OS == .Windows {
|
||||
foreign import lib "lib/miniaudio.lib"
|
||||
} else when ODIN_OS == .Linux {
|
||||
foreign import lib "lib/miniaudio.a"
|
||||
} else {
|
||||
foreign import lib "system:miniaudio"
|
||||
foreign import lib "lib/miniaudio.a"
|
||||
}
|
||||
|
||||
@(default_calling_convention="c", link_prefix="ma_")
|
||||
|
||||
Vendored
+1
-3
@@ -4,10 +4,8 @@ import "core:c"
|
||||
|
||||
when ODIN_OS == .Windows {
|
||||
foreign import lib "lib/miniaudio.lib"
|
||||
} else when ODIN_OS == .Linux {
|
||||
foreign import lib "lib/miniaudio.a"
|
||||
} else {
|
||||
foreign import lib "system:miniaudio"
|
||||
foreign import lib "lib/miniaudio.a"
|
||||
}
|
||||
|
||||
/************************************************************************************************************************************************************
|
||||
|
||||
Reference in New Issue
Block a user