From a9da6ce7d68c476e5c73782ed8f293b0f633c005 Mon Sep 17 00:00:00 2001
From: aliaspider
Date: Sun, 8 Nov 2015 19:11:33 +0100
Subject: (android) build fix

---
 Makefile        | 4 ----
 Makefile.common | 4 ++++
 jni/Android.mk  | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index f65cd92..58aca57 100644
--- a/Makefile
+++ b/Makefile
@@ -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)
-- 
cgit v1.2.3