Browse Source

Fixed miniaudio on macos (#2675)

* Fixed miniaudio on macos. Simplified soloud xmake.lua which depends on it.

It's an entitlements issue that is solved with a #define for miniaudio: <https://github.com/mackron/miniaudio/issues/203>

* dont link AudioUnit or CoreAudio on iOS
Yotam Gingold 1 year ago
parent
commit
9362a7a404
2 changed files with 6 additions and 3 deletions
  1. 6 0
      packages/m/miniaudio/xmake.lua
  2. 0 3
      packages/s/soloud/xmake.lua

+ 6 - 0
packages/m/miniaudio/xmake.lua

@@ -10,6 +10,12 @@ package("miniaudio")
     add_versions("0.11.17", "4b139065f7068588b73d507d24e865060e942eb731f988ee5a8f1828155b9480")
     add_versions("0.11.18", "85ca916266d809b39902e180a6d16f82caea9c2ea1cea6d374413641b7ba48c3")
 
+    if is_plat("iphoneos") then
+        add_frameworks("AudioToolbox", "AVFoundation", "CoreFoundation", "Foundation")
+    elseif is_plat("macosx") then
+        add_defines("MA_NO_RUNTIME_LINKING")
+        add_frameworks("AudioToolbox", "CoreAudio", "AudioUnit", "AVFoundation", "CoreFoundation", "Foundation")
+    end
 
     on_install(function (package)
         os.cp("miniaudio.h", package:installdir("include"))

+ 0 - 3
packages/s/soloud/xmake.lua

@@ -12,8 +12,6 @@ package("soloud")
 
     if is_plat("linux") then
         add_syslinks("pthread", "dl")
-    elseif is_plat("macosx", "iphoneos") then
-        add_frameworks("AudioToolbox", "AVFoundation", "CoreFoundation", "Foundation")
     end
 
     on_install(function (package)
@@ -40,7 +38,6 @@ package("soloud")
                 add_files("src/**.c|tools/**.c|backend/**.c")
 
                 if is_plat("iphoneos", "macosx") then
-                    add_frameworks("AudioToolbox", "AVFoundation", "CoreFoundation", "Foundation")
                     add_files("src/backend/miniaudio/*.mm")
                 else
                     add_files("src/backend/miniaudio/*.cpp")