diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2018-06-10 16:59:34 +0200 |
|---|---|---|
| committer | Loic Blot <loic.blot@unix-experience.fr> | 2018-06-10 17:01:47 +0200 |
| commit | 0ef9c53a8c20872ce69f1c539167497a04efe529 (patch) | |
| tree | cf3c784bdfd0b0bc95e5c8f780305057fd5741c2 /build/android/Makefile | |
| parent | b5350e27ad7bc54a3a97db988119db83c67f96b3 (diff) | |
| download | minetest-0ef9c53a8c20872ce69f1c539167497a04efe529.tar.gz minetest-0ef9c53a8c20872ce69f1c539167497a04efe529.tar.bz2 minetest-0ef9c53a8c20872ce69f1c539167497a04efe529.zip | |
Fix many Android build issues
It remains one issue with MT itself and rtti
Diffstat (limited to 'build/android/Makefile')
| -rw-r--r-- | build/android/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/build/android/Makefile b/build/android/Makefile index df1b01ae9..5fe0321b7 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -83,7 +83,7 @@ OGG_LIB = $(OGG_DIR)libs/$(TARGET_ABI)/libogg.so VORBIS_LIB = $(OGG_DIR)libs/$(TARGET_ABI)/libogg.so OGG_TIMESTAMP = $(OGG_DIR)timestamp OGG_TIMESTAMP_INT = $(ANDR_ROOT)/deps/ogg_timestamp -OGG_URL_GIT = https://github.com/vincentjames501/libvorbis-libogg-android +OGG_URL_GIT = https://gitlab.com/minetest/libvorbis-libogg-android IRRLICHT_REVISION = 5145 IRRLICHT_DIR = $(ANDR_ROOT)/deps/irrlicht/ @@ -262,8 +262,10 @@ $(OGG_LIB): $(OGG_TIMESTAMP) cd ${OGG_DIR}; \ export APP_PLATFORM=${APP_PLATFORM}; \ export TARGET_ABI=${TARGET_ABI}; \ - ${ANDROID_NDK}/ndk-build NDEBUG=${NDEBUG} \ - NDK_APPLICATION_MK=${ANDR_ROOT}/jni/Deps.mk || exit 1; \ + ${ANDROID_NDK}/build/tools/make-standalone-toolchain.sh \ + --toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION} \ + --platform=${APP_PLATFORM} \ + --install-dir=$${TOOLCHAIN}; \ touch ${OGG_TIMESTAMP}; \ touch ${OGG_TIMESTAMP_INT}; \ else \ |