aboutsummaryrefslogtreecommitdiff
path: root/build/android/Makefile
diff options
context:
space:
mode:
authorsapier <Sapier at GMX dot net>2015-01-15 21:51:54 +0100
committersapier <Sapier at GMX dot net>2015-01-15 21:51:54 +0100
commit9f52149a11fab736b61d34b2e619ae9f6bd1f287 (patch)
treea41bade0ae3019a62cb9e130060a374832a900bd /build/android/Makefile
parenteb6b6ff333dc23143c7ea82b2da0862640521110 (diff)
downloadminetest-9f52149a11fab736b61d34b2e619ae9f6bd1f287.tar.gz
minetest-9f52149a11fab736b61d34b2e619ae9f6bd1f287.tar.bz2
minetest-9f52149a11fab736b61d34b2e619ae9f6bd1f287.zip
Android, build: Update curl to 7.40.00
Diffstat (limited to 'build/android/Makefile')
-rw-r--r--build/android/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/build/android/Makefile b/build/android/Makefile
index e160716d3..68625b6a7 100644
--- a/build/android/Makefile
+++ b/build/android/Makefile
@@ -117,7 +117,7 @@ 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.35.0
+CURL_VERSION = 7.40.0
CURL_DIR = $(ROOT)/deps/curl-$(CURL_VERSION)
CURL_LIB = $(CURL_DIR)/lib/.libs/libcurl.a
CURL_TIMESTAMP = $(CURL_DIR)/timestamp
@@ -499,6 +499,7 @@ curl_download :
wget ${CURL_URL_HTTP} || exit 1; \
tar -xjf curl-${CURL_VERSION}.tar.bz2 || exit 1; \
rm curl-${CURL_VERSION}.tar.bz2; \
+ ln -s curl-${CURL_VERSION} curl; \
fi
curl : $(CURL_LIB)
@@ -542,7 +543,8 @@ $(CURL_LIB): $(CURL_TIMESTAMP) $(OPENSSL_LIB)
fi
clean_curl :
- $(RM) -rf deps/curl-${CURL_VERSION}
+ $(RM) -rf deps/curl-${CURL_VERSION} \
+ $(RM) -f deps/curl
curl_binary: