Fix Android build since a704c04f00bfea4b77550169fa08105c2ee0dfd0Oxh. ok @zeno-

[dragonfireclient.git] / build / android / Makefile

diff --git a/build/android/Makefile b/build/android/Makefile
index d770462e1ed065f55c44e8e5616dbbf78dcab935..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
@@ -130,6 +130,9 @@ FREETYPE_TIMESTAMP = $(FREETYPE_DIR)timestamp
 FREETYPE_TIMESTAMP_INT = $(ROOT)/deps/freetype_timestamp
 FREETYPE_URL_GIT = https://github.com/cdave1/freetype2-android
 
+SQLITE3_FOLDER = sqlite-amalgamation-3080704
+SQLITE3_URL = http://www.sqlite.org/2014/$(SQLITE3_FOLDER).zip
+
 -include $(PATHCFGFILE)
 
 #use interim target variable to switch leveldb on or off
@@ -140,7 +143,7 @@ endif
 .PHONY : debug release reconfig delconfig \
        leveldb_download clean_leveldb leveldb\
        irrlicht_download clean_irrlicht irrlicht \
-       clean_assets assets \
+       clean_assets assets sqlite3_download \
        freetype_download clean_freetype freetype \
        apk clean_apk \
        clean_all clean prep_srcdir \
@@ -496,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)
@@ -539,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: 
@@ -553,6 +558,18 @@ curl_binary:
                rm curl-7.34.0-rtmp-ssh2-ssl-zlib-static-bin-android.tar.gz;           \
        fi
 
+sqlite3_download: deps/${SQLITE3_FOLDER}/sqlite3.c
+
+deps/${SQLITE3_FOLDER}/sqlite3.c :
+       cd deps;                                                                    \
+       wget ${SQLITE3_URL};                                                        \
+       unzip ${SQLITE3_FOLDER}.zip;                                                \
+       ln -s ${SQLITE3_FOLDER} sqlite
+       
+clean_sqlite3:
+       cd deps && $(RM) -rf ${SQLITE3_FOLDER} && $(RM) -f ${SQLITE3_FOLDER}.zip && \
+       $(RM) -f sqlite
+
 $(ASSETS_TIMESTAMP) : $(IRRLICHT_LIB)
        @mkdir -p ${ROOT}/deps;                                                     \
        LAST_MODIF=$$(find ${ROOT}/../../builtin -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \
@@ -661,7 +678,8 @@ clean_assets :
        @$(RM) -r assets
        
 apk: $(PATHCFGFILE) assets $(IRRLICHT_LIB) $(CURL_LIB) $(LEVELDB_TARGET)       \
-       $(OPENAL_LIB) $(OGG_LIB) prep_srcdir $(ROOT)/jni/src/android_version.h
+       $(OPENAL_LIB) $(OGG_LIB) prep_srcdir $(ROOT)/jni/src/android_version.h     \
+       sqlite3_download
        @export NDEBUG=$$NDEBUG; $(MAKE) -j${PARALLEL} manifest;                   \
        export PATH=$$PATH:${SDKFOLDER}/platform-tools:${ANDROID_NDK};             \
        export ANDROID_HOME=${SDKFOLDER};                                          \