Browse Source

Android build fixes

This fixes #8079
Loïc Blot 5 years ago
parent
commit
0acdf93683
2 changed files with 2 additions and 1 deletions
  1. 1 1
      build/android/Makefile
  2. 1 0
      src/client/tile.cpp

+ 1 - 1
build/android/Makefile

@@ -312,7 +312,7 @@ $(OPENSSL_LIB): $(OPENSSL_TIMESTAMP)
 	export PATH="$${TOOLCHAIN}/bin:$${PATH}";                                  \
 	export CFLAGS="$${CFLAGS} ${TARGET_CFLAGS_ADDON}";                         \
 	export LDFLAGS="$${LDFLAGS} ${TARGET_LDFLAGS_ADDON}";                      \
-	CC=${CROSS_CC} ./Configure -DL_ENDIAN android-${TARGET_ARCH}               \
+	CC=${CROSS_CC} ./Configure -DL_ENDIAN no-asm android-${TARGET_ARCH}        \
 		-D__ANDROID_API__=$(API);                                          \
 	CC=${CROSS_CC} ANDROID_DEV=/tmp/ndk-${TARGET_HOST} make depend;            \
 	CC=${CROSS_CC} ANDROID_DEV=/tmp/ndk-${TARGET_HOST} make build_libs;        \

+ 1 - 0
src/client/tile.cpp

@@ -19,6 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "tile.h"
 
+#include <cstring>
 #include <algorithm>
 #include <ICameraSceneNode.h>
 #include "util/string.h"