Changes required to build and run on Android.

coreyabshire · coreyabshire · commit b5ceb2f10ca4 · 2014-05-10T16:59:04.000-04:00
diff --git a/src/Makefile b/src/Makefile
@@ -2,10 +2,13 @@
 # Makefile
 #
 
-LIBS = -lpthread
+LIBS = 
+NDK = /android/ndk
+SYSROOT = $(NDK)/platforms/android-8/arch-arm
+CC = $(NDK)/toolchains/arm-linux-androideabi-4.8/prebuilt/windows-x86_64/bin/arm-linux-androideabi-gcc --sysroot=$(SYSROOT)
 
 
-default: fire
+default: firenzina
 
 OFILES = main.o \
                     50move.o \
@@ -63,22 +66,23 @@ OFILES = main.o \
                     top_node.o \
                     unmake_move.o \
                     utility.o \
-                 
-     
+                    cpu-features.o \
+
+
 $(OFILES): 
 
-fire:  $(OFILES) 
-	gcc -o fire $(OFILES)  $(LIBS) 
+firenzina:  $(OFILES)
+	$(CC) -o firenzina $(OFILES)  $(LIBS) 
 
 clean:
-	rm -f *.o  fire
+	rm -f *.o  firenzina
 
 .c.o:   main.c
-	gcc -c -g $*.c  -Wall -w -pipe  -s -std=c99 -DNDEBUG -DHAVE_STRUCT_TIMESPEC -Ofast -static  \
+	$(CC) -c -g $*.c  -Wall -w -pipe  -s -std=c99 -DNDEBUG -DHAVE_STRUCT_TIMESPEC -Ofast -static  \
                       -flto -fwhole-program -finline-functions -fprefetch-loop-arrays  \
-                      -Wfatal-errors -mtune=native -DHasPreFetch -DRobboBases \
-                      
-                         
+                      -Wfatal-errors -mtune=arm7 -DHasPreFetch -DRobboBases \
+
+
 
 # for popcount (AMD)          =   -march=amdfam10 -mtune=amdfam10 -mpopcnt -DHasPopCNT
 # for popcount (INTEL)        =   -msse4.2 -march=corei7 -mtune=corei7 -mpopcnt -DHasPopCNT
diff --git a/src/fire.h b/src/fire.h
@@ -50,6 +50,9 @@ along with this program. If not, see http://www.gnu.org/licenses/.
 
 #if defined(__i386__)
 #define Plat "Linux 32"
+#elif defined(__ANDROID__)
+#define boolean bool
+#define Plat "Android"
 #else
 #define Plat "Linux 64"
 //#define LinuxLargePages
@@ -495,4 +498,4 @@ char String3[MaxCPUs][64], String4[MaxCPUs][64];
 #endif
 
 char *InputBuffer, *input_ptr;
-#endif
+#endif
diff --git a/src/utility.c b/src/utility.c
@@ -385,6 +385,9 @@ void GetSysInfo()
 SYSTEM_INFO sysinfo;
     GetSystemInfo(&sysinfo);
     NumCPUs = sysinfo.dwNumberOfProcessors;
+#elif defined(__ANDROID__)
+#include "cpu-features.h"
+NumCPUs = android_getCpuCount();
 #else
 #include <sys/sysinfo.h>
 NumCPUs = get_nprocs();
diff --git a/src/win-linux.h b/src/win-linux.h
@@ -106,7 +106,11 @@ HANDLE PThread[MaxCPUs], PThreadIO;
 #define uint64 unsigned long long int
 #define INLINE inline
 #define Type64Bit "%lld"
+#ifdef __ANDROID__
+#define MemAlign(a, b, c) a = memalign (b, c)
+#else
 #define MemAlign(a, b, c) posix_memalign ((void*) &(a), b, c)
+#endif
 #define AlignedFree(x) free (x)
 #include "bits.h"
 #include <pthread.h>
