diff --git a/bridge/src/fmod_dynamic_loading.c b/bridge/src/fmod_dynamic_loading.c index a0a7990..5a99ad3 100644 --- a/bridge/src/fmod_dynamic_loading.c +++ b/bridge/src/fmod_dynamic_loading.c @@ -283,6 +283,8 @@ bool FMODBridge_linkLibraries() { #define FMB_ARCH "x86_64" #elif defined(__i386) || defined(_M_IX86) #define FMB_ARCH "x86" + #elif defined(__aarch64__) || defined(__arm64__) || defined(_M_ARM64) + #define FMB_ARCH "arm64" #endif #if defined(FMB_PLATFORM) && defined(FMB_ARCH) diff --git a/fmod/ext.manifest b/fmod/ext.manifest index 2ddf978..92946ba 100644 --- a/fmod/ext.manifest +++ b/fmod/ext.manifest @@ -1,5 +1,9 @@ name: "DefoldFMOD" platforms: + osx: + context: + libs: ["fmodbridge"] + arm64-ios: context: frameworks: ["AVFoundation"] diff --git a/fmod/lib/ios/libfmod_iphoneos.a b/fmod/lib/ios/libfmod_iphoneos.a index 44b86df..ecd5f1d 100644 Binary files a/fmod/lib/ios/libfmod_iphoneos.a and b/fmod/lib/ios/libfmod_iphoneos.a differ diff --git a/fmod/lib/ios/libfmodbridge.a b/fmod/lib/ios/libfmodbridge.a index f803707..ceda6b0 100644 Binary files a/fmod/lib/ios/libfmodbridge.a and b/fmod/lib/ios/libfmodbridge.a differ diff --git a/fmod/lib/ios/libfmodstudio_iphoneos.a b/fmod/lib/ios/libfmodstudio_iphoneos.a index 2c01571..2904200 100644 Binary files a/fmod/lib/ios/libfmodstudio_iphoneos.a and b/fmod/lib/ios/libfmodstudio_iphoneos.a differ diff --git a/fmod/lib/osx/libfmodbridge.a b/fmod/lib/osx/libfmodbridge.a index 719b78a..8d87912 100644 Binary files a/fmod/lib/osx/libfmodbridge.a and b/fmod/lib/osx/libfmodbridge.a differ diff --git a/fmod/lib/x86_64-ios/libfmod_iphonesimulator.a b/fmod/lib/x86_64-ios/libfmod_iphonesimulator.a index e73b0c1..957ef22 100644 Binary files a/fmod/lib/x86_64-ios/libfmod_iphonesimulator.a and b/fmod/lib/x86_64-ios/libfmod_iphonesimulator.a differ diff --git a/fmod/lib/x86_64-ios/libfmodbridge_simulator.a b/fmod/lib/x86_64-ios/libfmodbridge_simulator.a index 6e9cc2b..852112e 100644 Binary files a/fmod/lib/x86_64-ios/libfmodbridge_simulator.a and b/fmod/lib/x86_64-ios/libfmodbridge_simulator.a differ diff --git a/fmod/lib/x86_64-ios/libfmodstudio_iphonesimulator.a b/fmod/lib/x86_64-ios/libfmodstudio_iphonesimulator.a index f0fa9b6..8d75ad4 100644 Binary files a/fmod/lib/x86_64-ios/libfmodstudio_iphonesimulator.a and b/fmod/lib/x86_64-ios/libfmodstudio_iphonesimulator.a differ diff --git a/fmod/res/arm64-osx/Contents/MacOS/libfmod.dylib b/fmod/res/arm64-osx/Contents/MacOS/libfmod.dylib new file mode 100644 index 0000000..6b70f46 Binary files /dev/null and b/fmod/res/arm64-osx/Contents/MacOS/libfmod.dylib differ diff --git a/fmod/res/arm64-osx/Contents/MacOS/libfmodstudio.dylib b/fmod/res/arm64-osx/Contents/MacOS/libfmodstudio.dylib new file mode 100644 index 0000000..6604ef1 Binary files /dev/null and b/fmod/res/arm64-osx/Contents/MacOS/libfmodstudio.dylib differ diff --git a/fmod/res/arm64-osx/libfmod.dylib b/fmod/res/arm64-osx/libfmod.dylib new file mode 100644 index 0000000..6b70f46 Binary files /dev/null and b/fmod/res/arm64-osx/libfmod.dylib differ diff --git a/fmod/res/arm64-osx/libfmodstudio.dylib b/fmod/res/arm64-osx/libfmodstudio.dylib new file mode 100644 index 0000000..6604ef1 Binary files /dev/null and b/fmod/res/arm64-osx/libfmodstudio.dylib differ diff --git a/fmod/res/osx/Contents/MacOS/libfmod.dylib b/fmod/res/osx/Contents/MacOS/libfmod.dylib index e59b3b4..6b70f46 100644 Binary files a/fmod/res/osx/Contents/MacOS/libfmod.dylib and b/fmod/res/osx/Contents/MacOS/libfmod.dylib differ diff --git a/fmod/res/osx/Contents/MacOS/libfmodstudio.dylib b/fmod/res/osx/Contents/MacOS/libfmodstudio.dylib index e5b3d9c..6604ef1 100644 Binary files a/fmod/res/osx/Contents/MacOS/libfmodstudio.dylib and b/fmod/res/osx/Contents/MacOS/libfmodstudio.dylib differ diff --git a/fmod/res/osx/libfmod.dylib b/fmod/res/osx/libfmod.dylib new file mode 100644 index 0000000..6b70f46 Binary files /dev/null and b/fmod/res/osx/libfmod.dylib differ diff --git a/fmod/res/osx/libfmodstudio.dylib b/fmod/res/osx/libfmodstudio.dylib new file mode 100644 index 0000000..6604ef1 Binary files /dev/null and b/fmod/res/osx/libfmodstudio.dylib differ