diff options
| author | est31 <MTest31@outlook.com> | 2015-11-16 17:11:32 +0100 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2015-11-16 17:33:01 +0100 |
| commit | 2f58e4d9624b4f31c5064dc640e0ad40d8adb9ea (patch) | |
| tree | e04d5437b56b215ea6863b450606870903333cea /build | |
| parent | e664abeb887fe74ff1966e93ed5201c6e19a5c31 (diff) | |
| download | minetest-2f58e4d9624b4f31c5064dc640e0ad40d8adb9ea.tar.gz minetest-2f58e4d9624b4f31c5064dc640e0ad40d8adb9ea.tar.bz2 minetest-2f58e4d9624b4f31c5064dc640e0ad40d8adb9ea.zip | |
Android: hardcode irrlicht revision, update other dependencies
Recent irrlicht revisions break the build, hardcode the revision to a working one
until upstream publishes a working version. See issue #3366 for
a discussion about this.
Also update dependencies to current versions.
Diffstat (limited to 'build')
| -rw-r--r-- | build/android/Makefile | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/build/android/Makefile b/build/android/Makefile index 66d12ac8b..9f1076027 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -104,13 +104,14 @@ OGG_TIMESTAMP = $(OGG_DIR)timestamp OGG_TIMESTAMP_INT = $(ROOT)/deps/ogg_timestamp OGG_URL_GIT = https://github.com/vincentjames501/libvorbis-libogg-android +IRRLICHT_REVISION = 5122 IRRLICHT_DIR = $(ROOT)/deps/irrlicht/ IRRLICHT_LIB = $(IRRLICHT_DIR)lib/Android/libIrrlicht.a IRRLICHT_TIMESTAMP = $(IRRLICHT_DIR)timestamp IRRLICHT_TIMESTAMP_INT = $(ROOT)/deps/irrlicht_timestamp -IRRLICHT_URL_SVN = http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es/ +IRRLICHT_URL_SVN = http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@$(IRRLICHT_REVISION) -OPENSSL_VERSION = 1.0.1l +OPENSSL_VERSION = 1.0.1p OPENSSL_BASEDIR = openssl-$(OPENSSL_VERSION) OPENSSL_DIR = $(ROOT)/deps/$(OPENSSL_BASEDIR)/ OPENSSL_LIB = $(OPENSSL_DIR)/libssl.so.1.0.0 @@ -118,14 +119,14 @@ OPENSSL_TIMESTAMP = $(OPENSSL_DIR)timestamp OPENSSL_TIMESTAMP_INT = $(ROOT)/deps/openssl_timestamp OPENSSL_URL = http://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz -CURL_VERSION = 7.41.0 +CURL_VERSION = 7.45.0 CURL_DIR = $(ROOT)/deps/curl-$(CURL_VERSION) CURL_LIB = $(CURL_DIR)/lib/.libs/libcurl.a CURL_TIMESTAMP = $(CURL_DIR)/timestamp CURL_TIMESTAMP_INT = $(ROOT)/deps/curl_timestamp CURL_URL_HTTP = http://curl.haxx.se/download/curl-${CURL_VERSION}.tar.bz2 -GMP_VERSION = 6.0.0 +GMP_VERSION = 6.1.0 GMP_DIR = $(ROOT)/deps/gmp-$(GMP_VERSION) GMP_LIB = $(GMP_DIR)/usr/lib/libgmp.so GMP_TIMESTAMP = $(GMP_DIR)/timestamp @@ -145,8 +146,8 @@ ICONV_TIMESTAMP = $(ICONV_DIR)timestamp ICONV_TIMESTAMP_INT = $(ROOT)/deps/iconv_timestamp ICONV_URL_HTTP = http://ftp.gnu.org/pub/gnu/libiconv/libiconv-$(ICONV_VERSION).tar.gz -SQLITE3_FOLDER = sqlite-amalgamation-3080704 -SQLITE3_URL = http://www.sqlite.org/2014/$(SQLITE3_FOLDER).zip +SQLITE3_FOLDER = sqlite-amalgamation-3090200 +SQLITE3_URL = http://www.sqlite.org/2015/$(SQLITE3_FOLDER).zip -include $(PATHCFGFILE) |