From 4b6418cb02dc0872be61515d15833d907d9b525e Mon Sep 17 00:00:00 2001 From: Peter Osterlund Date: Sun, 10 Sep 2017 12:01:07 +0200 Subject: [PATCH] DroidFish: Updates for NDK version r15c. The minimum required android version had to be changed to 4.0.1. --- DroidFish/AndroidManifest.xml | 2 +- DroidFish/build_copy_exe.xml | 2 ++ DroidFish/jni/Application.mk | 7 +++---- DroidFish/jni/gtb/Android.mk | 3 +-- DroidFish/jni/gtb/compression/liblzf/lzfP.h | 6 +++++- DroidFish/jni/gtb/compression/lzma/Lzma86Dec.c | 4 ++-- DroidFish/jni/gtb/compression/lzma/Lzma86Enc.c | 4 ++-- DroidFish/jni/gtb/compression/lzma/LzmaEnc.c | 2 +- DroidFish/jni/rtb/Android.mk | 7 +++---- DroidFish/jni/rtb/move.hpp | 2 +- DroidFish/jni/stockfish/Android.mk | 2 ++ DroidFish/jni/stockfish/misc.h | 14 -------------- DroidFish/jni/stockfish/ucioption.cpp | 2 +- 13 files changed, 24 insertions(+), 33 deletions(-) diff --git a/DroidFish/AndroidManifest.xml b/DroidFish/AndroidManifest.xml index b01f21d..3cf187d 100644 --- a/DroidFish/AndroidManifest.xml +++ b/DroidFish/AndroidManifest.xml @@ -9,7 +9,7 @@ - + + diff --git a/DroidFish/jni/Application.mk b/DroidFish/jni/Application.mk index 2d75cf7..9735e92 100644 --- a/DroidFish/jni/Application.mk +++ b/DroidFish/jni/Application.mk @@ -1,5 +1,4 @@ -APP_PLATFORM := 11 -APP_ABI := arm64-v8a armeabi-v7a armeabi mips64 x86 x86_64 -APP_STL := gnustl_static +APP_PLATFORM := android-14 +APP_ABI := all +APP_STL := c++_static APP_OPTIM := release -NDK_TOOLCHAIN_VERSION := 4.9 diff --git a/DroidFish/jni/gtb/Android.mk b/DroidFish/jni/gtb/Android.mk index a79735b..e6fcfa5 100644 --- a/DroidFish/jni/gtb/Android.mk +++ b/DroidFish/jni/gtb/Android.mk @@ -18,7 +18,6 @@ LOCAL_CFLAGS := \ -I $(LOCAL_PATH)/sysport/ -I $(LOCAL_PATH)/compression/ \ -I $(LOCAL_PATH)/compression/liblzf/ -I $(LOCAL_PATH)/compression/zlib/ \ -I $(LOCAL_PATH)/compression/lzma/ -I $(LOCAL_PATH)/compression/huffman/ \ - -D Z_PREFIX -D NDEBUG -Wall\ - -mandroid -DTARGET_OS=android -D__ANDROID__ + -D Z_PREFIX -D NDEBUG -Wall include $(BUILD_SHARED_LIBRARY) diff --git a/DroidFish/jni/gtb/compression/liblzf/lzfP.h b/DroidFish/jni/gtb/compression/liblzf/lzfP.h index d533f18..03f9cfe 100644 --- a/DroidFish/jni/gtb/compression/liblzf/lzfP.h +++ b/DroidFish/jni/gtb/compression/liblzf/lzfP.h @@ -79,7 +79,11 @@ * Unconditionally aligning does not cost very much, so do it if unsure */ #ifndef STRICT_ALIGN -# define STRICT_ALIGN !(defined(__i386) || defined (__amd64)) +# if !(defined(__i386) || defined (__amd64)) +# define STRICT_ALIGN 1 +# else +# define STRICT_ALIGN 0 +# endif #endif /* diff --git a/DroidFish/jni/gtb/compression/lzma/Lzma86Dec.c b/DroidFish/jni/gtb/compression/lzma/Lzma86Dec.c index c3f1dff..b7e8993 100755 --- a/DroidFish/jni/gtb/compression/lzma/Lzma86Dec.c +++ b/DroidFish/jni/gtb/compression/lzma/Lzma86Dec.c @@ -12,8 +12,8 @@ Public domain */ #define LZMA86_SIZE_OFFSET (1 + LZMA_PROPS_SIZE) #define LZMA86_HEADER_SIZE (LZMA86_SIZE_OFFSET + 8) -static void *SzAlloc(void *p, size_t size) { p = p; return MyAlloc(size); } -static void SzFree(void *p, void *address) { p = p; MyFree(address); } +static void *SzAlloc(void *p, size_t size) { (void)p; return MyAlloc(size); } +static void SzFree(void *p, void *address) { (void)p; MyFree(address); } static ISzAlloc g_Alloc = { SzAlloc, SzFree }; SRes Lzma86_GetUnpackSize(const Byte *src, SizeT srcLen, UInt64 *unpackSize) diff --git a/DroidFish/jni/gtb/compression/lzma/Lzma86Enc.c b/DroidFish/jni/gtb/compression/lzma/Lzma86Enc.c index 4cd30e6..ee8f6df 100755 --- a/DroidFish/jni/gtb/compression/lzma/Lzma86Enc.c +++ b/DroidFish/jni/gtb/compression/lzma/Lzma86Enc.c @@ -13,8 +13,8 @@ Public domain */ #define SZE_OUT_OVERFLOW SZE_DATA_ERROR -static void *SzAlloc(void *p, size_t size) { p = p; return MyAlloc(size); } -static void SzFree(void *p, void *address) { p = p; MyFree(address); } +static void *SzAlloc(void *p, size_t size) { (void)p; return MyAlloc(size); } +static void SzFree(void *p, void *address) { (void)p; MyFree(address); } static ISzAlloc g_Alloc = { SzAlloc, SzFree }; #define LZMA86_SIZE_OFFSET (1 + LZMA_PROPS_SIZE) diff --git a/DroidFish/jni/gtb/compression/lzma/LzmaEnc.c b/DroidFish/jni/gtb/compression/lzma/LzmaEnc.c index fc9153c..6dc2008 100755 --- a/DroidFish/jni/gtb/compression/lzma/LzmaEnc.c +++ b/DroidFish/jni/gtb/compression/lzma/LzmaEnc.c @@ -2140,7 +2140,7 @@ static void LzmaEnc_Finish(CLzmaEncHandle pp) if (p->mtMode) MatchFinderMt_ReleaseStream(&p->matchFinderMt); #else - pp = pp; + (void)pp; #endif } diff --git a/DroidFish/jni/rtb/Android.mk b/DroidFish/jni/rtb/Android.mk index 7fce3d7..0c17eba 100644 --- a/DroidFish/jni/rtb/Android.mk +++ b/DroidFish/jni/rtb/Android.mk @@ -9,9 +9,8 @@ LOCAL_SRC_FILES := \ RtbProbe.cpp LOCAL_CFLAGS := --std=c++11 \ - -I $(LOCAL_PATH)/sysport/ -I -DNDEBUG -Wall \ - -mandroid -DTARGET_OS=android -D__ANDROID__ \ - -D__STDC_INT64__ -D_GLIBCXX_USE_C99_STDINT_TR1 \ - -D_GLIBCXX_HAS_GTHREADS -D_GLIBCXX__PTHREADS + -I $(LOCAL_PATH)/sysport/ -I -DNDEBUG -Wall + +LOCAL_LDLIBS += -latomic include $(BUILD_SHARED_LIBRARY) diff --git a/DroidFish/jni/rtb/move.hpp b/DroidFish/jni/rtb/move.hpp index 02e2542..92bc777 100644 --- a/DroidFish/jni/rtb/move.hpp +++ b/DroidFish/jni/rtb/move.hpp @@ -45,7 +45,7 @@ public: int promoteTo() const; /** Not declared "nothrow". Avoids nullptr check in generated assembly code when using placement new. */ - void* operator new (std::size_t size, void* ptr) { return ptr; } + void* operator new (size_t size, void* ptr) { return ptr; } private: /** From square, 0-63. */ diff --git a/DroidFish/jni/stockfish/Android.mk b/DroidFish/jni/stockfish/Android.mk index 1cb5de2..504ada6 100644 --- a/DroidFish/jni/stockfish/Android.mk +++ b/DroidFish/jni/stockfish/Android.mk @@ -20,6 +20,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := stockfish-nopie LOCAL_SRC_FILES := $(SF_SRC_FILES) LOCAL_CFLAGS := -std=c++11 -O2 $(MY_ARCH_DEF) +LOCAL_LDLIBS += -latomic include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) @@ -27,4 +28,5 @@ LOCAL_MODULE := stockfish LOCAL_SRC_FILES := $(SF_SRC_FILES) LOCAL_CFLAGS := -std=c++11 -O2 -fPIE $(MY_ARCH_DEF) LOCAL_LDFLAGS += -fPIE -pie +LOCAL_LDLIBS += -latomic include $(BUILD_EXECUTABLE) diff --git a/DroidFish/jni/stockfish/misc.h b/DroidFish/jni/stockfish/misc.h index 8283c63..b63e613 100644 --- a/DroidFish/jni/stockfish/misc.h +++ b/DroidFish/jni/stockfish/misc.h @@ -26,7 +26,6 @@ #include #include #include -#include #include "types.h" @@ -110,17 +109,4 @@ namespace WinProcGroup { void bindThisThread(size_t idx); } -inline int stoi(const std::string& s) { - std::stringstream ss(s); - int result = 0; - ss >> result; - return result; -} - -inline std::string to_string(int v) { - std::stringstream ss; - ss << v; - return ss.str(); -} - #endif // #ifndef MISC_H_INCLUDED diff --git a/DroidFish/jni/stockfish/ucioption.cpp b/DroidFish/jni/stockfish/ucioption.cpp index 062b52d..a2b4f27 100644 --- a/DroidFish/jni/stockfish/ucioption.cpp +++ b/DroidFish/jni/stockfish/ucioption.cpp @@ -112,7 +112,7 @@ Option::Option(OnChange f) : type("button"), min(0), max(0), on_change(f) {} Option::Option(int v, int minv, int maxv, OnChange f) : type("spin"), min(minv), max(maxv), on_change(f) -{ defaultValue = currentValue = to_string(v); } +{ defaultValue = currentValue = std::to_string(v); } Option::operator int() const { assert(type == "check" || type == "spin");