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=05b2a37cf4411bd1791d83fd4f153f1e783a5cb1;hpb=75bf03886e4acb87bd7922d42d828f56c5dbe4bb;p=picodrive.git

diff --git a/jni/Android.mk b/jni/Android.mk
index 05b2a37..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 := ../
@@ -28,7 +25,6 @@ asm_memory = 0
 asm_render = 0
 asm_ym2612 = 0
 asm_misc = 0
-asm_cdpico = 0
 asm_cdmemory = 0
 asm_mix = 0
 
@@ -39,17 +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_cdpico = 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
@@ -81,7 +87,7 @@ 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