diff options
| author | aliaspider | 2015-11-08 19:11:33 +0100 |
|---|---|---|
| committer | aliaspider | 2015-11-08 19:11:33 +0100 |
| commit | a9da6ce7d68c476e5c73782ed8f293b0f633c005 (patch) | |
| tree | 7dcbdec8fae6085b58099a23df6d5e116c09eb38 | |
| parent | a9ed8660a5aa71e06f0c15eb2ee346af1879fc97 (diff) | |
| download | snes9x2002-a9da6ce7d68c476e5c73782ed8f293b0f633c005.tar.gz snes9x2002-a9da6ce7d68c476e5c73782ed8f293b0f633c005.tar.bz2 snes9x2002-a9da6ce7d68c476e5c73782ed8f293b0f633c005.zip | |
(android) build fix
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | Makefile.common | 4 | ||||
| -rw-r--r-- | jni/Android.mk | 2 |
3 files changed, 6 insertions, 4 deletions
@@ -69,10 +69,6 @@ else CFLAGS += -D__WIN32__ -D__WIN32_LIBRETRO__ endif -ifeq ($(ARM_ASM), 1) -CFLAGS += -DARM_ASM -endif - CORE_DIR := ./src LIBRETRO_DIR := ./libretro diff --git a/Makefile.common b/Makefile.common index 2630e9e..2f04842 100644 --- a/Makefile.common +++ b/Makefile.common @@ -91,6 +91,10 @@ INCLUDES = -Ilibretro -Isrc -I. DEFINES += -DHAVE_STRINGS_H -DHAVE_STDINT_H -DHAVE_INTTYPES_H -D__LIBRETRO__ -DINLINE=inline DEFINES += -DUSE_SA1 +ifeq ($(ARM_ASM), 1) +DEFINES += -DARM_ASM +endif + ifeq ($(platform), sncps3) WARNINGS_DEFINES = CODE_DEFINES = diff --git a/jni/Android.mk b/jni/Android.mk index cd27dbe..7f692a8 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -2,6 +2,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +ARM_ASM = 1 + LOCAL_MODULE := retro ifeq ($(TARGET_ARCH),arm) |