X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=jni%2FAndroid.mk;h=60d6f7de12a60d5930dd57545f042cb68b5b7eff;hb=a33a365d783c8a6a360de8668eeb86a26086c551;hp=8389f7eb397ac5cb61e499bb88fff41924d7b8ba;hpb=fc11dd059b5c7369a51ddcca532505b588bd0030;p=picodrive.git

diff --git a/jni/Android.mk b/jni/Android.mk
index 8389f7e..60d6f7d 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -2,11 +2,10 @@ 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
+#fix stupid change in ndk r11 that breaks compiling even when the exe would run fine
+LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
+
+LOCAL_MODULE := retro
 
 R := ../
 FR := $(LOCAL_PATH)/$(R)
@@ -59,7 +58,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
 
@@ -71,10 +70,11 @@ LOCAL_SRC_FILES += $(R)zlib/gzio.c $(R)zlib/inffast.c $(R)zlib/inflate.c \
 
 LOCAL_SRC_FILES += $(R)unzip/unzip.c $(R)unzip/unzip_stream.c
 
-LOCAL_C_INCLUDES += $(R) $(R)platform/linux
+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 -DINLINE=inline
 LOCAL_CFLAGS += $(addprefix -D,$(DEFINES))
-LOCAL_CFLAGS += -Wall -O3 -ffast-math -DNDEBUG
 LOCAL_LDLIBS := -llog
 
 include $(BUILD_SHARED_LIBRARY)