(Android) Buildfix

[picodrive.git] / jni / Android.mk

diff --git a/jni/Android.mk b/jni/Android.mk
index 122b18e..a59144a 100644 (file)
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -2,11 +2,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-ifeq ($(NEON_BUILD)$(TARGET_ARCH_ABI),1armeabi-v7a)
-  LOCAL_MODULE := retro_picodrive-neon
-else
-  LOCAL_MODULE := retro_picodrive
-endif
+LOCAL_MODULE := retro
 
 R := ../
 FR := $(LOCAL_PATH)/$(R)
@@ -59,7 +55,7 @@ ARCH := $(TARGET_ARCH)
 include $(R)platform/common/common.mak
 
 LOCAL_SRC_FILES += $(SRCS_COMMON)
-LOCAL_SRC_FILES += $(R)platform/libretro.c
+LOCAL_SRC_FILES += $(R)platform/libretro/libretro.c
 LOCAL_SRC_FILES += $(R)platform/common/mp3.c
 LOCAL_SRC_FILES += $(R)platform/common/mp3_dummy.c
 
@@ -74,7 +70,7 @@ LOCAL_SRC_FILES += $(R)unzip/unzip.c $(R)unzip/unzip_stream.c
 LOCAL_C_INCLUDES += $(R)
 
 # note: don't use -O3, causes some NDKs run out of memory while compiling FAME
-LOCAL_CFLAGS += -Wall -O2 -ffast-math -DNDEBUG
+LOCAL_CFLAGS += -Wall -O2 -ffast-math -DNDEBUG -DINLINE=inline
 LOCAL_CFLAGS += $(addprefix -D,$(DEFINES))
 LOCAL_LDLIBS := -llog