diff options
| author | Loïc Blot <loic.blot@unix-experience.fr> | 2019-01-09 14:39:43 +0100 |
|---|---|---|
| committer | Loïc Blot <loic.blot@unix-experience.fr> | 2019-01-09 14:39:43 +0100 |
| commit | 0acdf936830f0bee6bff553201febedecb12a482 (patch) | |
| tree | 644b56201f860bef42acfe9911bd45f58a099711 | |
| parent | 4b04268304a2f798cea110415f360c165395b4fb (diff) | |
| download | minetest-0acdf936830f0bee6bff553201febedecb12a482.tar.gz minetest-0acdf936830f0bee6bff553201febedecb12a482.tar.bz2 minetest-0acdf936830f0bee6bff553201febedecb12a482.zip | |
Android build fixes
This fixes #8079
| -rw-r--r-- | build/android/Makefile | 2 | ||||
| -rw-r--r-- | src/client/tile.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/build/android/Makefile b/build/android/Makefile index 478a4690f..c5a21c290 100644 --- a/build/android/Makefile +++ b/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; \ diff --git a/src/client/tile.cpp b/src/client/tile.cpp index a65eb5fc8..233a64e14 100644 --- a/src/client/tile.cpp +++ b/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" |