Browse Source

Added change requested by @riccardobl linking with libc++ static
Changed ABI configuration to avoid building riscv64, which is useless as it's only supported for WearOS according to google play error: "'riscv64' architecture is only supported for application targeting WearOS."

Jesus Oliver 1 month ago
parent
commit
5256c3c065

+ 2 - 1
jme3-android-native/openalsoft.gradle

@@ -118,7 +118,8 @@ openalAbis.each { abi ->
             '-DALSOFT_SHARED=OFF',
             '-DBUILD_SHARED_LIBS=OFF',
             '-DALSOFT_STATIC=ON',
-            '-DLIBTYPE=STATIC'
+            '-DLIBTYPE=STATIC',
+            '-DCMAKE_CXX_FLAGS=-stdlib=libc++'
         ]
 
         dependsOn copyOpenALSoft

+ 1 - 1
jme3-android-native/src/native/jme_bufferallocator/Application.mk

@@ -36,4 +36,4 @@
 APP_PLATFORM := android-19
 # change this to 'debug' to see android logs
 APP_OPTIM := release
-APP_ABI := all
+APP_ABI := armeabi-v7a,arm64-v8a,x86,x86_64

+ 1 - 1
jme3-android-native/src/native/jme_decode/Application.mk

@@ -1,3 +1,3 @@
 APP_PLATFORM := android-9
 APP_OPTIM := release
-APP_ABI := all
+APP_ABI := armeabi-v7a,arm64-v8a,x86,x86_64

+ 1 - 1
jme3-android-native/src/native/jme_openalsoft/Android.mk

@@ -41,7 +41,7 @@ LOCAL_CFLAGS                := -ffast-math \
                                -DRESTRICT="" \
                                -DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=true
 
-LOCAL_LDLIBS                := -lOpenSLES -llog -Wl,-s -lc++_shared
+LOCAL_LDLIBS                := -lOpenSLES -llog -Wl,-s -lc++_static -lc++abi
 LOCAL_STATIC_LIBRARIES      := openalsoft_prebuilt
 # (or LOCAL_WHOLE_STATIC_LIBRARIES if you need every object pulled in)
 

+ 1 - 1
jme3-android-native/src/native/jme_openalsoft/Application.mk

@@ -1,5 +1,5 @@
 APP_PLATFORM := android-19
 APP_OPTIM := release
-APP_ABI := all
+APP_ABI := armeabi-v7a,arm64-v8a,x86,x86_64
 APP_STL := c++_static