Merge pull request #3094 from laytan/fix-miniaudio-import

vendor/miniaudio: fix import for MacOS
This commit is contained in:
Jeroen van Rijn
2024-01-13 21:31:13 +01:00
committed by GitHub
16 changed files with 16 additions and 48 deletions
+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
+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"
} }
/************************************************************************************************************************************************************ /************************************************************************************************************************************************************
+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"
} }
/************************************************************************************************************************************************************ /************************************************************************************************************************************************************
+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"
+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"
} }
/* /*
+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"
} }
/************************************************************************************************************************************************************ /************************************************************************************************************************************************************
+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"
} }
/************************************************************************************************************************************************************ /************************************************************************************************************************************************************
+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"
} }
/************************************************************************************************************************************************************** /**************************************************************************************************************************************************************
+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 {
+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"
} }
/* /*
+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
+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"
} }
/************************************************************************************************************************************************************ /************************************************************************************************************************************************************
+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"
} }
/************************************************************************************************************************************************************ /************************************************************************************************************************************************************
+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_")
+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_")
+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"
} }
/************************************************************************************************************************************************************ /************************************************************************************************************************************************************