diff options
| author | est31 <MTest31@outlook.com> | 2016-12-07 21:27:07 +0100 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2016-12-07 21:27:07 +0100 |
| commit | 24719c6908305c9505eafc372fb4cfbbbd2fcf70 (patch) | |
| tree | 2bb1d49b0c7ef53f63b79c4ac15dd0cfa0c256ce /build/android | |
| parent | bbe8386a667e4fe719502bd838211f37c5448efa (diff) | |
| download | minetest-24719c6908305c9505eafc372fb4cfbbbd2fcf70.tar.gz minetest-24719c6908305c9505eafc372fb4cfbbbd2fcf70.tar.bz2 minetest-24719c6908305c9505eafc372fb4cfbbbd2fcf70.zip | |
Android: fix build and update deps
Diffstat (limited to 'build/android')
| -rw-r--r-- | build/android/Makefile | 8 | ||||
| -rw-r--r-- | build/android/jni/Android.mk | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/build/android/Makefile b/build/android/Makefile index 380296993..9f2b5d626 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -91,7 +91,7 @@ IRRLICHT_TIMESTAMP = $(IRRLICHT_DIR)timestamp IRRLICHT_TIMESTAMP_INT = $(ANDR_ROOT)/deps/irrlicht_timestamp IRRLICHT_URL_SVN = https://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@$(IRRLICHT_REVISION) -OPENSSL_VERSION = 1.0.2h +OPENSSL_VERSION = 1.0.2j OPENSSL_BASEDIR = openssl-$(OPENSSL_VERSION) OPENSSL_DIR = $(ANDR_ROOT)/deps/$(OPENSSL_BASEDIR)/ OPENSSL_LIB = $(OPENSSL_DIR)/libssl.so.1.0.0 @@ -99,14 +99,14 @@ OPENSSL_TIMESTAMP = $(OPENSSL_DIR)timestamp OPENSSL_TIMESTAMP_INT = $(ANDR_ROOT)/deps/openssl_timestamp OPENSSL_URL = https://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz -CURL_VERSION = 7.48.0 +CURL_VERSION = 7.51.0 CURL_DIR = $(ANDR_ROOT)/deps/curl-$(CURL_VERSION) CURL_LIB = $(CURL_DIR)/lib/.libs/libcurl.a CURL_TIMESTAMP = $(CURL_DIR)/timestamp CURL_TIMESTAMP_INT = $(ANDR_ROOT)/deps/curl_timestamp CURL_URL_HTTP = https://curl.haxx.se/download/curl-${CURL_VERSION}.tar.bz2 -GMP_VERSION = 6.1.0 +GMP_VERSION = 6.1.1 GMP_DIR = $(ANDR_ROOT)/deps/gmp-$(GMP_VERSION) GMP_LIB = $(GMP_DIR)/usr/lib/libgmp.so GMP_TIMESTAMP = $(GMP_DIR)/timestamp @@ -126,7 +126,7 @@ ICONV_TIMESTAMP = $(ICONV_DIR)timestamp ICONV_TIMESTAMP_INT = $(ANDR_ROOT)/deps/iconv_timestamp ICONV_URL_HTTP = https://ftp.gnu.org/pub/gnu/libiconv/libiconv-$(ICONV_VERSION).tar.gz -SQLITE3_FOLDER = sqlite-amalgamation-3120200 +SQLITE3_FOLDER = sqlite-amalgamation-3150200 SQLITE3_URL = https://www.sqlite.org/2016/$(SQLITE3_FOLDER).zip ANDROID_SDK = $(shell grep '^sdk\.dir' local.properties | sed 's/^.*=[[:space:]]*//') diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk index 651fa318e..c2186efaf 100644 --- a/build/android/jni/Android.mk +++ b/build/android/jni/Android.mk @@ -203,6 +203,7 @@ LOCAL_SRC_FILES := \ jni/src/porting.cpp \ jni/src/profiler.cpp \ jni/src/quicktune.cpp \ + jni/src/reflowscan.cpp \ jni/src/remoteplayer.cpp \ jni/src/rollback.cpp \ jni/src/rollback_interface.cpp \ |