X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=jni%2FAndroid.mk;h=bc8170266fdb530db9b3a86d688f0365291bbb3e;hb=refs%2Fheads%2Flibretro-reset;hp=492cfc92c991b36ea92b7e4c100c5096ded869d4;hpb=06d30e62f69325ebd722251d68362873ce6c487f;p=picodrive.git

diff --git a/jni/Android.mk b/jni/Android.mk
index 492cfc9..bc81702 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -7,9 +7,6 @@ ifneq ($(GIT_VERSION)," unknown")
 	LOCAL_CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
 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 := ../
@@ -38,16 +35,27 @@ ifeq ($(TARGET_ARCH),arm)
   endif
 
   use_cyclone = 1
-  use_drz80 = 1
+
+  # texrels, -perf ~~8%
+  use_drz80 = 0
+  use_cz80 = 1
+
   use_sh2drc = 1
   use_svpdrc = 1
 
-  asm_memory = 1
+#  asm_memory = 1 # texrels, -perf negligible
   asm_render = 1
-  asm_ym2612 = 1
+#  asm_ym2612 = 1 # texrels, -perf ~~4%
   asm_misc = 1
-  asm_cdmemory = 1
+#  asm_cdmemory = 1 # texrels
   asm_mix = 1
+
+# for armeabi to build...
+CYCLONE_CONFIG = cyclone_config_armv4.h
+
+$(cleantarget)::
+	$(MAKE) -C $(FR)cpu/cyclone/ clean
+
 else
   use_fame = 1
   use_cz80 = 1
@@ -74,12 +82,12 @@ 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)
 
 # 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 += -Wall -O2 -ffast-math -DNDEBUG
 LOCAL_CFLAGS += $(addprefix -D,$(DEFINES))
 LOCAL_LDLIBS := -llog