try to deal with some famec compiler issues

[picodrive.git] / jni / Android.mk

diff --git a/jni/Android.mk b/jni/Android.mk
index dfd8ff5..122b18e 100644 (file)
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -18,6 +18,7 @@ use_drz80 = 0
 use_cz80 = 0
 use_sh2drc = 0
 use_sh2mame = 0
+use_svpdrc = 0
 
 asm_memory = 0
 asm_render = 0
@@ -25,6 +26,7 @@ asm_ym2612 = 0
 asm_misc = 0
 asm_cdpico = 0
 asm_cdmemory = 0
+asm_mix = 0
 
 ifeq ($(TARGET_ARCH),arm)
   LOCAL_ARM_MODE := arm
@@ -35,6 +37,7 @@ ifeq ($(TARGET_ARCH),arm)
   use_cyclone = 1
   use_drz80 = 1
   use_sh2drc = 1
+  use_svpdrc = 1
 
   asm_memory = 1
   asm_render = 1
@@ -42,6 +45,7 @@ ifeq ($(TARGET_ARCH),arm)
   asm_misc = 1
   asm_cdpico = 1
   asm_cdmemory = 1
+  asm_mix = 1
 else
   use_fame = 1
   use_cz80 = 1
@@ -56,6 +60,7 @@ include $(R)platform/common/common.mak
 
 LOCAL_SRC_FILES += $(SRCS_COMMON)
 LOCAL_SRC_FILES += $(R)platform/libretro.c
+LOCAL_SRC_FILES += $(R)platform/common/mp3.c
 LOCAL_SRC_FILES += $(R)platform/common/mp3_dummy.c
 
 # zlib/unzip
@@ -66,10 +71,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
 LOCAL_CFLAGS += $(addprefix -D,$(DEFINES))
-LOCAL_CFLAGS += -Wall -O3 -ffast-math -DNDEBUG
 LOCAL_LDLIBS := -llog
 
 include $(BUILD_SHARED_LIBRARY)