android: make armeabi buildable

diff --git a/cpu/cyclone_config.h b/cpu/cyclone_config.h
index ed3b257..2320517 100644 (file)
--- a/cpu/cyclone_config.h
+++ b/cpu/cyclone_config.h
@@ -8,7 +8,9 @@
 **/\r
 \r
 \r
+#ifndef HAVE_ARMv6\r
 #define HAVE_ARMv6                  1\r
+#endif\r
 #define USE_MS_SYNTAX               0\r
 #define CYCLONE_FOR_GENESIS         2\r
 #define COMPRESS_JUMPTABLE          0\r

diff --git a/cpu/cyclone_config_armv4.h b/cpu/cyclone_config_armv4.h
new file mode 100644 (file)
index 0000000..2319029
--- /dev/null
+++ b/cpu/cyclone_config_armv4.h
@@ -0,0 +1,2 @@
+#define HAVE_ARMv6 0
+#include "cyclone_config.h"

diff --git a/jni/Android.mk b/jni/Android.mk
index a0f5dc8..bc81702 100644 (file)
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -49,6 +49,13 @@ ifeq ($(TARGET_ARCH),arm)
   asm_misc = 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

diff --git a/platform/common/common.mak b/platform/common/common.mak
index cd92f54..89e4605 100644 (file)
--- a/platform/common/common.mak
+++ b/platform/common/common.mak
@@ -173,13 +173,15 @@ ifeq "$(use_cyclone)" "1"
 $(FR)pico/pico.c: $(FR)cpu/cyclone/Cyclone.h
 endif
 
+CYCLONE_CONFIG ?= cyclone_config.h
+
 $(FR)cpu/cyclone/Cyclone.h:
        @echo "Cyclone submodule is missing, please run 'git submodule update --init'"
        @false
 
-$(FR)cpu/cyclone/Cyclone.s: $(FR)cpu/cyclone_config.h
+$(FR)cpu/cyclone/Cyclone.s: $(FR)cpu/$(CYCLONE_CONFIG)
        @echo building Cyclone...
-       @make -C $(R)cpu/cyclone/ CONFIG_FILE=../cyclone_config.h
+       @make -C $(R)cpu/cyclone/ CONFIG_FILE=../$(CYCLONE_CONFIG)
 
 $(FR)cpu/cyclone/Cyclone.s: $(FR)cpu/cyclone/*.cpp $(FR)cpu/cyclone/*.h