diff options
| author | est31 <MTest31@outlook.com> | 2015-05-15 05:02:19 +0200 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2015-05-15 05:08:59 +0200 |
| commit | 33a633a6317d272ffd06320c92416644a367b186 (patch) | |
| tree | c9c361dc3e6230e383bb116d46d59d92d33f2473 | |
| parent | be18bd6a8cafdc2c452da39dd8cc428d8dbf62e6 (diff) | |
| download | minetest-33a633a6317d272ffd06320c92416644a367b186.tar.gz minetest-33a633a6317d272ffd06320c92416644a367b186.tar.bz2 minetest-33a633a6317d272ffd06320c92416644a367b186.zip | |
Fix libgmp for Android
Android terminated immediately after start since commit
181f7baa453c58d4070de7196fd74663110946a8
because library wasn't loaded, and libminetest.so required
libgmp.so.10 instead of libgmp.so.
The second issue has been solved by the linker flags.
| -rw-r--r-- | build/android/Makefile | 4 | ||||
| -rw-r--r-- | build/android/src/net/minetest/minetest/MtNativeActivity.java | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/build/android/Makefile b/build/android/Makefile index 898968bed..b11d73972 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -120,7 +120,7 @@ CURL_URL_HTTP = http://curl.haxx.se/download/curl-${CURL_VERSION}.tar.bz2 GMP_VERSION = 6.0.0 GMP_DIR = $(ROOT)/deps/gmp-$(GMP_VERSION) -GMP_LIB = $(GMP_DIR)/usr/lib/libgmp.la +GMP_LIB = $(GMP_DIR)/usr/lib/libgmp.so GMP_TIMESTAMP = $(GMP_DIR)/timestamp GMP_TIMESTAMP_INT = $(ROOT)/deps/gmp_timestamp GMP_URL_HTTP = https://gmplib.org/download/gmp/gmp-$(GMP_VERSION).tar.bz2 @@ -602,6 +602,8 @@ $(GMP_LIB): $(GMP_TIMESTAMP) export PATH="$${TOOLCHAIN}/bin:$${PATH}"; \ export CC=${CROSS_PREFIX}gcc; \ export CXX=${CROSS_PREFIX}g++; \ + export LIBGMP_LDFLAGS="-avoid-version"; \ + export LIBGMPXX_LDFLAGS="-avoid-version"; \ ./configure --disable-static --host=${TARGET_HOST} --prefix=/usr; \ $(MAKE) install DESTDIR=/${GMP_DIR} || exit 1; \ touch ${GMP_TIMESTAMP}; \ diff --git a/build/android/src/net/minetest/minetest/MtNativeActivity.java b/build/android/src/net/minetest/minetest/MtNativeActivity.java index 2bfcef93c..5c1f44d17 100644 --- a/build/android/src/net/minetest/minetest/MtNativeActivity.java +++ b/build/android/src/net/minetest/minetest/MtNativeActivity.java @@ -86,6 +86,12 @@ public class MtNativeActivity extends NativeActivity { System.loadLibrary("vorbis"); System.loadLibrary("ssl"); System.loadLibrary("crypto"); + System.loadLibrary("gmp"); + + // We don't have to load libminetest.so ourselves, + // but if we do, we get nicer logcat errors when + // loading fails. + System.loadLibrary("minetest"); } private int m_MessagReturnCode; |