Update to FMOD 1.10.11 and iOS SDK 12

dapetcu21 · Feb 22, 2019 · bb7bd51 · bb7bd51
1 parent e720f8b
commit bb7bd51
Show file tree

Hide file tree

Showing 18 changed files with 5 additions and 1 deletion.
diff --git a/bridge/Makefile.ios b/bridge/Makefile.ios
@@ -14,7 +14,7 @@ HEADERS = \
 
 CXX := xcrun --sdk iphoneos c++ -isysroot `xcrun --sdk iphoneos --show-sdk-path` -arch arm64 -arch armv7s -arch armv7
 
-CXXFLAGS := -std=c++11 -O3 -fvisibility=hidden -I./include -miphoneos-version-min=6.0
+CXXFLAGS := -std=c++11 -O3 -fvisibility=hidden -I./include -miphoneos-version-min=8.0
 
 all: $(LIBPATH)
 

diff --git a/fmod/ext.manifest b/fmod/ext.manifest
@@ -3,10 +3,12 @@ platforms:
   arm64-ios:
     context:
       frameworks: ["AVFoundation"]
+      libs:       ["c++"]
 
   armv7-ios:
     context:
       frameworks: ["AVFoundation"]
+      libs:       ["c++"]
 
   x86_64-osx:
     context:

diff --git a/fmod/lib/android/fmod.jar b/fmod/lib/android/fmod.jar
diff --git a/fmod/lib/ios/libfmod_iphoneos.a b/fmod/lib/ios/libfmod_iphoneos.a
diff --git a/fmod/lib/ios/libfmodbridge.a b/fmod/lib/ios/libfmodbridge.a
diff --git a/fmod/lib/ios/libfmodstudio_iphoneos.a b/fmod/lib/ios/libfmodstudio_iphoneos.a
diff --git a/fmod/lib/web/libfmodstudio.a b/fmod/lib/web/libfmodstudio.a
diff --git a/fmod/res/armv7-android/lib/armeabi-v7a/libfmod.so b/fmod/res/armv7-android/lib/armeabi-v7a/libfmod.so
diff --git a/fmod/res/armv7-android/lib/armeabi-v7a/libfmodstudio.so b/fmod/res/armv7-android/lib/armeabi-v7a/libfmodstudio.so
diff --git a/fmod/res/x86-win32/fmod.dll b/fmod/res/x86-win32/fmod.dll
diff --git a/fmod/res/x86-win32/fmodstudio.dll b/fmod/res/x86-win32/fmodstudio.dll
diff --git a/fmod/res/x86_64-linux/libfmod.so b/fmod/res/x86_64-linux/libfmod.so
diff --git a/fmod/res/x86_64-linux/libfmodstudio.so b/fmod/res/x86_64-linux/libfmodstudio.so
diff --git a/fmod/res/x86_64-osx/Contents/MacOS/libfmod.dylib b/fmod/res/x86_64-osx/Contents/MacOS/libfmod.dylib
diff --git a/fmod/res/x86_64-osx/Contents/MacOS/libfmodstudio.dylib b/fmod/res/x86_64-osx/Contents/MacOS/libfmodstudio.dylib
diff --git a/fmod/res/x86_64-win32/fmod64.dll b/fmod/res/x86_64-win32/fmod64.dll
diff --git a/fmod/res/x86_64-win32/fmodstudio64.dll b/fmod/res/x86_64-win32/fmodstudio64.dll
diff --git a/fmod/src/fmod_extension.cpp b/fmod/src/fmod_extension.cpp
@@ -1,7 +1,9 @@
 #define LIB_NAME "DefoldFMOD"
 #define MODULE_NAME "fmod"
 
+#ifndef DLIB_LOG_DOMAIN
 #define DLIB_LOG_DOMAIN "fmod"
+#endif
 #include <dmsdk/sdk.h>
 
 #if defined(DM_PLATFORM_OSX) || defined(DM_PLATFORM_WINDOWS) || defined(DM_PLATFORM_LINUX) || defined(DM_PLATFORM_IOS) || defined(DM_PLATFORM_HTML5) || defined(DM_PLATFORM_ANDROID)