eliminate texrels (wip)

[picodrive.git] / jni / Android.mk

diff --git a/jni/Android.mk b/jni/Android.mk
index 511bf77..1b8b956 100644 (file)
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -52,6 +52,9 @@ else
   use_sh2mame = 1
 endif
 
+# PD is currently not strict aliasing safe
+LOCAL_CFLAGS += -fno-strict-aliasing
+
 # sources
 SRCS_COMMON :=
 DEFINES :=
@@ -60,6 +63,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
@@ -68,12 +72,13 @@ LOCAL_SRC_FILES += $(R)zlib/gzio.c $(R)zlib/inffast.c $(R)zlib/inflate.c \
        $(R)zlib/crc32.c $(R)zlib/adler32.c $(R)zlib/zutil.c \
        $(R)zlib/compress.c $(R)zlib/uncompr.c
 
-LOCAL_SRC_FILES += $(R)unzip/unzip.c $(R)unzip/unzip_stream.c
+LOCAL_SRC_FILES += $(R)unzip/unzip.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)