Fix Android build since a704c04f00bfea4b77550169fa08105c2ee0dfd0Oxh. ok @zeno-

[dragonfireclient.git] / build / android / Makefile

diff --git a/build/android/Makefile b/build/android/Makefile
index ae11651576c9f0bd7e120dbcea0a0bd650a72cd1..68625b6a7cc026cdff974836e272206fec3bc8f4 100644 (file)
--- a/build/android/Makefile
+++ b/build/android/Makefile
@@ -36,7 +36,7 @@ TARGET_ABI = armeabi
 TARGET_LIBDIR = armeabi
 TARGET_TOOLCHAIN = arm-linux-androideabi-
 TARGET_CFLAGS_ADDON = -mfloat-abi=softfp -mfpu=vfp
-TARGET_ARCH = armv7
+TARGET_ARCH = arm
 CROSS_PREFIX = arm-linux-androideabi-
 COMPILER_VERSION = 4.8
 HAVE_LEVELDB = 1
@@ -52,7 +52,7 @@ HAVE_LEVELDB = 1
 #                                              -mfloat-abi=hard -march=armv7-a
 #TARGET_CXXFLAGS_ADDON = $(TARGET_CFLAGS_ADDON)
 #TARGET_LDFLAGS_ADDON = -Wl,--no-warn-mismatch -lm_hard
-#TARGET_ARCH = arm
+#TARGET_ARCH = armv7
 #CROSS_PREFIX = arm-linux-androideabi-
 #COMPILER_VERSION = 4.8
 #HAVE_LEVELDB = 1
@@ -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: