From: notaz <notasas@gmail.com>
Date: Fri, 13 Oct 2017 20:38:09 +0000 (+0300)
Subject: android: make armeabi buildable
X-Git-Tag: v1.93~44
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=picodrive.git;a=commitdiff_plain;h=b5f5dc1fad9a7876a2d146b1c61d06e64435a86e

android: make armeabi buildable
---

diff --git a/cpu/cyclone_config.h b/cpu/cyclone_config.h
index ed3b257..2320517 100644
--- a/cpu/cyclone_config.h
+++ b/cpu/cyclone_config.h
@@ -8,7 +8,9 @@
 **/
 
 
+#ifndef HAVE_ARMv6
 #define HAVE_ARMv6                  1
+#endif
 #define USE_MS_SYNTAX               0
 #define CYCLONE_FOR_GENESIS         2
 #define COMPRESS_JUMPTABLE          0
diff --git a/cpu/cyclone_config_armv4.h b/cpu/cyclone_config_armv4.h
new file mode 100644
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
--- 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
--- 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