Skip to content

Commit 5256c3c

Browse files
author
Jesus Oliver
committed
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."
1 parent be712c7 commit 5256c3c

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

jme3-android-native/openalsoft.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,8 @@ openalAbis.each { abi ->
118118
'-DALSOFT_SHARED=OFF',
119119
'-DBUILD_SHARED_LIBS=OFF',
120120
'-DALSOFT_STATIC=ON',
121-
'-DLIBTYPE=STATIC'
121+
'-DLIBTYPE=STATIC',
122+
'-DCMAKE_CXX_FLAGS=-stdlib=libc++'
122123
]
123124

124125
dependsOn copyOpenALSoft

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@
3636
APP_PLATFORM := android-19
3737
# change this to 'debug' to see android logs
3838
APP_OPTIM := release
39-
APP_ABI := all
39+
APP_ABI := armeabi-v7a,arm64-v8a,x86,x86_64
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
APP_PLATFORM := android-9
22
APP_OPTIM := release
3-
APP_ABI := all
3+
APP_ABI := armeabi-v7a,arm64-v8a,x86,x86_64

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ LOCAL_CFLAGS := -ffast-math \
4141
-DRESTRICT="" \
4242
-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=true
4343

44-
LOCAL_LDLIBS := -lOpenSLES -llog -Wl,-s -lc++_shared
44+
LOCAL_LDLIBS := -lOpenSLES -llog -Wl,-s -lc++_static -lc++abi
4545
LOCAL_STATIC_LIBRARIES := openalsoft_prebuilt
4646
# (or LOCAL_WHOLE_STATIC_LIBRARIES if you need every object pulled in)
4747

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
APP_PLATFORM := android-19
22
APP_OPTIM := release
3-
APP_ABI := all
3+
APP_ABI := armeabi-v7a,arm64-v8a,x86,x86_64
44
APP_STL := c++_static
55

0 commit comments

Comments
 (0)