Merged in AuahDark/love-android-sdl2/love11-arm64 (pull request #15)

Add ARM64 ABI support
This commit is contained in:
Miku AuahDark
2019-07-01 13:28:00 +00:00
committed by Alex Szpakowski
4 changed files with 18 additions and 1 deletions
+5 -1
View File
@@ -21,7 +21,7 @@ android {
ndk { ndk {
// Specifies the ABI configurations of your native // Specifies the ABI configurations of your native
// libraries Gradle should build and package with your APK. // libraries Gradle should build and package with your APK.
abiFilters 'armeabi-v7a' abiFilters 'armeabi-v7a', 'arm64-v8a'
} }
} }
buildTypes { buildTypes {
@@ -45,6 +45,10 @@ android {
lintOptions { lintOptions {
abortOnError false abortOnError false
} }
packagingOptions {
exclude 'lib/arm64-v8a/libSDL2.so'
exclude 'lib/armeabi-v7a/libSDL2.so'
}
} }
dependencies { dependencies {
+8
View File
@@ -11,6 +11,14 @@ LOCAL_CFLAGS := -fexceptions -g -Dlinux -Dunix \
LOCAL_CPPFLAGS := ${LOCAL_CFLAGS} LOCAL_CPPFLAGS := ${LOCAL_CFLAGS}
# I don't think there's armeabi-v7a device without NEON instructions in 2018
LOCAL_ARM_NEON := true
ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
# ARM64 does have socklen_t
LOCAL_CFLAGS += -DHAS_SOCKLEN_T=1
endif
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
${LOCAL_PATH}/src \ ${LOCAL_PATH}/src \
${LOCAL_PATH}/src/modules \ ${LOCAL_PATH}/src/modules \
@@ -8,6 +8,11 @@ LOCAL_CFLAGS := -DAL_ALEXT_PROTOTYPES -DAL_BUILD_LIBRARY -D_GNU_SOURCE=1 -D_P
LOCAL_CPPFLAGS := ${LOCAL_CFLAGS} LOCAL_CPPFLAGS := ${LOCAL_CFLAGS}
ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
# ARM64 have log2f function
LOCAL_CFLAGS += -DHAVE_LOG2F
endif
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
${LOCAL_PATH}/include \ ${LOCAL_PATH}/include \
${LOCAL_PATH}/common \ ${LOCAL_PATH}/common \