LOVE/love-android
1
0
Fork 0
mirror of https://github.com/love2d/love-android.git synced 2026-08-20 20:51:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix log2f conflict.

Browse Source
This commit is contained in:
Tae Hanazono
2019-07-01 23:05:08 +08:00
parent 288f005d86
commit 07149c0ba8
3 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
love/src/jni/openal-soft-1.18.2/Android.mk
+10 -5
View File
@@ -8,11 +8,6 @@ LOCAL_CFLAGS := -DAL_ALEXT_PROTOTYPES -DAL_BUILD_LIBRARY -D_GNU_SOURCE=1 -D_P
LOCAL_CPPFLAGS := ${LOCAL_CFLAGS}
ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
# ARM64 have log2f function
LOCAL_CFLAGS += -DHAVE_LOG2F
endif
LOCAL_C_INCLUDES := \
${LOCAL_PATH}/include \
${LOCAL_PATH}/common \
@@ -42,4 +37,14 @@ LOCAL_SRC_FILES := \
LOCAL_LDLIBS := -lOpenSLES
ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
# ARM64 have log2f function
LOCAL_CFLAGS += -DHAVE_LOG2F
else ifeq ($(NDK_R17),yes)
# NDK r17 and later always add log2f
LOCAL_CFLAGS += -DHAVE_LOG2F
# Also make sure to link with android_support
LOCAL_LDLIBS += -landroid_support
endif
include $(BUILD_SHARED_LIBRARY)