diff --git a/bridge/Makefile.ios b/bridge/Makefile.ios index 6a0ad8e..5a58087 100644 --- 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 index a55d3b5..d68dfc2 100644 --- 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 index 7d9ed56..e441d2f 100755 Binary files a/fmod/lib/android/fmod.jar and b/fmod/lib/android/fmod.jar differ diff --git a/fmod/lib/ios/libfmod_iphoneos.a b/fmod/lib/ios/libfmod_iphoneos.a index ce63c63..b0ad182 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 e438e97..a7003d4 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 472c5f8..57c634c 100644 Binary files a/fmod/lib/ios/libfmodstudio_iphoneos.a and b/fmod/lib/ios/libfmodstudio_iphoneos.a differ diff --git a/fmod/lib/web/libfmodstudio.a b/fmod/lib/web/libfmodstudio.a index fc8ee68..b2abbca 100644 Binary files a/fmod/lib/web/libfmodstudio.a and b/fmod/lib/web/libfmodstudio.a differ diff --git a/fmod/res/armv7-android/lib/armeabi-v7a/libfmod.so b/fmod/res/armv7-android/lib/armeabi-v7a/libfmod.so index 04a8a1c..1293d83 100755 Binary files a/fmod/res/armv7-android/lib/armeabi-v7a/libfmod.so and b/fmod/res/armv7-android/lib/armeabi-v7a/libfmod.so differ diff --git a/fmod/res/armv7-android/lib/armeabi-v7a/libfmodstudio.so b/fmod/res/armv7-android/lib/armeabi-v7a/libfmodstudio.so index 81cb3d2..65424c8 100755 Binary files a/fmod/res/armv7-android/lib/armeabi-v7a/libfmodstudio.so and b/fmod/res/armv7-android/lib/armeabi-v7a/libfmodstudio.so differ diff --git a/fmod/res/x86-win32/fmod.dll b/fmod/res/x86-win32/fmod.dll index eda4aeb..c9ae32a 100644 Binary files a/fmod/res/x86-win32/fmod.dll and b/fmod/res/x86-win32/fmod.dll differ diff --git a/fmod/res/x86-win32/fmodstudio.dll b/fmod/res/x86-win32/fmodstudio.dll index 2d38f3f..03e64ac 100644 Binary files a/fmod/res/x86-win32/fmodstudio.dll and b/fmod/res/x86-win32/fmodstudio.dll differ diff --git a/fmod/res/x86_64-linux/libfmod.so b/fmod/res/x86_64-linux/libfmod.so index ef79cb1..0c8b7c7 100755 Binary files a/fmod/res/x86_64-linux/libfmod.so and b/fmod/res/x86_64-linux/libfmod.so differ diff --git a/fmod/res/x86_64-linux/libfmodstudio.so b/fmod/res/x86_64-linux/libfmodstudio.so index 746e754..73dcec6 100755 Binary files a/fmod/res/x86_64-linux/libfmodstudio.so and b/fmod/res/x86_64-linux/libfmodstudio.so differ diff --git a/fmod/res/x86_64-osx/Contents/MacOS/libfmod.dylib b/fmod/res/x86_64-osx/Contents/MacOS/libfmod.dylib index 30b310a..03f22d5 100644 Binary files a/fmod/res/x86_64-osx/Contents/MacOS/libfmod.dylib and b/fmod/res/x86_64-osx/Contents/MacOS/libfmod.dylib differ diff --git a/fmod/res/x86_64-osx/Contents/MacOS/libfmodstudio.dylib b/fmod/res/x86_64-osx/Contents/MacOS/libfmodstudio.dylib index 4c4bc1f..fde3350 100644 Binary files a/fmod/res/x86_64-osx/Contents/MacOS/libfmodstudio.dylib and b/fmod/res/x86_64-osx/Contents/MacOS/libfmodstudio.dylib differ diff --git a/fmod/res/x86_64-win32/fmod64.dll b/fmod/res/x86_64-win32/fmod64.dll index 8038513..960b727 100644 Binary files a/fmod/res/x86_64-win32/fmod64.dll and b/fmod/res/x86_64-win32/fmod64.dll differ diff --git a/fmod/res/x86_64-win32/fmodstudio64.dll b/fmod/res/x86_64-win32/fmodstudio64.dll index 94a1269..cb606f9 100644 Binary files a/fmod/res/x86_64-win32/fmodstudio64.dll and b/fmod/res/x86_64-win32/fmodstudio64.dll differ diff --git a/fmod/src/fmod_extension.cpp b/fmod/src/fmod_extension.cpp index b9ad936..fa65bf4 100644 --- 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 #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)