diff options
| author | Aaron Kling | 2018-04-04 14:18:44 -0500 |
|---|---|---|
| committer | Aaron Kling | 2018-04-04 14:18:44 -0500 |
| commit | ea07a1e148789469da89bb4e1de91dc0422b13c6 (patch) | |
| tree | 0a825fcd60eee1c745f6d690bf3980be7987b8c4 /jni | |
| parent | d8084b0e8f906feac45c387db8e7bd00fced2f98 (diff) | |
| download | snes9x2002-ea07a1e148789469da89bb4e1de91dc0422b13c6.tar.gz snes9x2002-ea07a1e148789469da89bb4e1de91dc0422b13c6.tar.bz2 snes9x2002-ea07a1e148789469da89bb4e1de91dc0422b13c6.zip | |
Fix up android jni makefiles
Arm asm fails to compile with clang, so force gcc for jni
Diffstat (limited to 'jni')
| -rw-r--r-- | jni/Android.mk | 14 | ||||
| -rw-r--r-- | jni/Application.mk | 3 |
2 files changed, 7 insertions, 10 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index 2e2517d..324a646 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -1,5 +1,10 @@ LOCAL_PATH := $(call my-dir) +ARM_ASM = 0 +SOURCES := +DEFINES := +COMMON_DEFINES := + include $(CLEAR_VARS) LOCAL_MODULE := retro @@ -8,18 +13,9 @@ ifeq ($(TARGET_ARCH),arm) ARM_ASM = 1 ASM_CPU = 0 ASM_SPC700 = 0 -LOCAL_CFLAGS += -DANDROID_ARM LOCAL_ARM_MODE := arm endif -ifeq ($(TARGET_ARCH),x86) -LOCAL_CFLAGS += -DANDROID_X86 -endif - -ifeq ($(TARGET_ARCH),mips) -LOCAL_CFLAGS += -DANDROID_MIPS -D__mips__ -D__MIPSEL__ -endif - ifeq ($(NDK_DEBUG),1) DEBUG = 1 endif diff --git a/jni/Application.mk b/jni/Application.mk index f05229c..81ea664 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -1 +1,2 @@ -APP_ABI := armeabi armeabi-v7a +APP_ABI := all +NDK_TOOLCHAIN_VERSION := 4.9 |