From 9f52149a11fab736b61d34b2e619ae9f6bd1f287 Mon Sep 17 00:00:00 2001
From: sapier <Sapier at GMX dot net>
Date: Thu, 15 Jan 2015 21:51:54 +0100
Subject: [PATCH] Android, build: Update curl to 7.40.00
---
build/android/Makefile | 6 ++++--
build/android/jni/Android.mk | 4 ++--
2 files changed, 6 insertions(+), 4 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:
diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk
index 69b527fd6..7546626b2 100644
--- a/build/android/jni/Android.mk
+++ b/build/android/jni/Android.mk
@@ -16,7 +16,7 @@ endif
include $(CLEAR_VARS)
LOCAL_MODULE := curl
-LOCAL_SRC_FILES := deps/curl-7.35.0/lib/.libs/libcurl.a
+LOCAL_SRC_FILES := deps/curl/lib/.libs/libcurl.a
include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS)
@@ -94,7 +94,7 @@ LOCAL_C_INCLUDES := \
jni/src/cguittfont \
deps/irrlicht/include \
deps/freetype2-android/include \
- deps/curl-7.35.0/include \
+ deps/curl/include \
deps/openal-soft/jni/OpenAL/include \
deps/libvorbis-libogg-android/jni/include \
deps/leveldb/include \
--
GitLab