Wuzzy
/
BlockColor-Engine
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Android, build: Update curl to 7.40.00

This commit is contained in:
sapier 2015-01-15 21:51:54 +01:00
parent eb6b6ff333
commit 9f52149a11
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/android/Makefile
View File

@ -117,7 +117,7 @@ OPENSSL_TIMESTAMP = $(OPENSSL_DIR)timestamp
OPENSSL_TIMESTAMP_INT = $(ROOT)/deps/openssl_timestamp OPENSSL_TIMESTAMP_INT = $(ROOT)/deps/openssl_timestamp
OPENSSL_URL = http://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz 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_DIR = $(ROOT)/deps/curl-$(CURL_VERSION)
CURL_LIB = $(CURL_DIR)/lib/.libs/libcurl.a CURL_LIB = $(CURL_DIR)/lib/.libs/libcurl.a
CURL_TIMESTAMP = $(CURL_DIR)/timestamp CURL_TIMESTAMP = $(CURL_DIR)/timestamp
@ -499,6 +499,7 @@ curl_download :
wget ${CURL_URL_HTTP} || exit 1; \ wget ${CURL_URL_HTTP} || exit 1; \
tar -xjf curl-${CURL_VERSION}.tar.bz2 || exit 1; \ tar -xjf curl-${CURL_VERSION}.tar.bz2 || exit 1; \
rm curl-${CURL_VERSION}.tar.bz2; \ rm curl-${CURL_VERSION}.tar.bz2; \
ln -s curl-${CURL_VERSION} curl; \
fi fi
curl : $(CURL_LIB) curl : $(CURL_LIB)
@ -542,7 +543,8 @@ $(CURL_LIB): $(CURL_TIMESTAMP) $(OPENSSL_LIB)
fi fi
clean_curl : clean_curl :
$(RM) -rf deps/curl-${CURL_VERSION} $(RM) -rf deps/curl-${CURL_VERSION} \
$(RM) -f deps/curl
curl_binary: curl_binary:

4
build/android/jni/Android.mk
View File

@ -16,7 +16,7 @@ endif
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := curl 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 $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
@ -94,7 +94,7 @@ LOCAL_C_INCLUDES := \
jni/src/cguittfont \ jni/src/cguittfont \
deps/irrlicht/include \ deps/irrlicht/include \
deps/freetype2-android/include \ deps/freetype2-android/include \
deps/curl-7.35.0/include \ deps/curl/include \
deps/openal-soft/jni/OpenAL/include \ deps/openal-soft/jni/OpenAL/include \
deps/libvorbis-libogg-android/jni/include \ deps/libvorbis-libogg-android/jni/include \
deps/leveldb/include \ deps/leveldb/include \