X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=build%2Fandroid%2FMakefile;h=c5a21c290b72c692b9a96f534273d6f36fa13ca9;hb=4e4fb4db2adcd0b3abd02cd6390b350b1129cc64;hp=d75c6a409fc2c5f7a2b98bdb3989cdb12a1c492d;hpb=b459f53ac366930f93928352833ea266fbfcd92e;p=dragonfireclient.git diff --git a/build/android/Makefile b/build/android/Makefile index d75c6a409..c5a21c290 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -2,54 +2,38 @@ OS := $(shell uname) -#automaticaly set number of jobs -ifeq ($(OS),Linux) - PARALLEL := $(shell grep -c ^processor /proc/cpuinfo) -else - PARALLEL := 1 -endif - # compile with GPROF # GPROF = 1 # build for build platform -APP_PLATFORM = android-9 +API = 14 +APP_PLATFORM = android-$(API) -# paths used for timestaps, dependencys, tree config and libs -PATHCFGFILE = path.cfg +ANDR_ROOT = $(shell pwd) +PROJ_ROOT = $(shell realpath $(ANDR_ROOT)/../..) +APP_ROOT = $(ANDR_ROOT)/src/main -ROOT = $(shell pwd) - -################################################################################ -# Android Version code -# Increase for each build! -################################################################################ -ANDROID_VERSION_CODE = 3 +VERSION_MAJOR := $(shell cat $(PROJ_ROOT)/CMakeLists.txt | \ + grep ^set\(VERSION_MAJOR\ | sed 's/)/ /' | cut -f2 -d' ') +VERSION_MINOR := $(shell cat $(PROJ_ROOT)/CMakeLists.txt | \ + grep ^set\(VERSION_MINOR\ | sed 's/)/ /' | cut -f2 -d' ') +VERSION_PATCH := $(shell cat $(PROJ_ROOT)/CMakeLists.txt | \ + grep ^set\(VERSION_PATCH\ | sed 's/)/ /' | cut -f2 -d' ') ################################################################################ -# toolchain config for arm old processors +# toolchain config for arm new processors ################################################################################ TARGET_HOST = arm-linux -TARGET_ABI = armeabi -TARGET_LIBDIR = armeabi +TARGET_ABI = armeabi-v7a +TARGET_LIBDIR = armeabi-v7a TARGET_TOOLCHAIN = arm-linux-androideabi- -TARGET_CFLAGS_ADDON = -mfloat-abi=softfp -mfpu=vfp -CROSS_PREFIX = arm-linux-androideabi- -COMPILER_VERSION = 4.8 - -################################################################################ -# toolchain config for arm new processors -################################################################################ -#TARGET_HOST = arm-linux -#TARGET_ABI = armeabi-v7a-hard -#TARGET_LIBDIR = armeabi-v7a -#TARGET_TOOLCHAIN = arm-linux-androideabi- -#TARGET_CFLAGS_ADDON = -mfpu=vfpv3-d16 -D_NDK_MATH_NO_SOFTFP=1 \ -# -mfloat-abi=hard -march=armv7-a -#TARGET_CXXFLAGS_ADDON = $(TARGET_CFLAGS_ADDON) -#TARGET_LDFLAGS_ADDON = -Wl,--no-warn-mismatch -lm_hard -#CROSS_PREFIX = arm-linux-androideabi- -#COMPILER_VERSION = 4.8 +TARGET_CFLAGS_ADDON = -mfloat-abi=softfp -mfpu=vfpv3 -O3 +TARGET_CXXFLAGS_ADDON = $(TARGET_CFLAGS_ADDON) +TARGET_ARCH = armv7 +CROSS_CC = clang +CROSS_CXX = clang++ +COMPILER_VERSION = clang +HAVE_LEVELDB = 0 ################################################################################ # toolchain config for little endian mips @@ -58,8 +42,11 @@ COMPILER_VERSION = 4.8 #TARGET_ABI = mips #TARGET_LIBDIR = mips #TARGET_TOOLCHAIN = mipsel-linux-android- -#CROSS_PREFIX = mipsel-linux-android- -#COMPILER_VERSION = 4.8 +#TARGET_ARCH = mips32 +#CROSS_CC = mipsel-linux-android-gcc +#CROSS_CXX = mipsel-linux-android-g++ +#COMPILER_VERSION = 4.9 +#HAVE_LEVELDB = 0 ################################################################################ # toolchain config for x86 @@ -68,132 +55,151 @@ COMPILER_VERSION = 4.8 #TARGET_ABI = x86 #TARGET_LIBDIR = x86 #TARGET_TOOLCHAIN = x86- -#CROSS_PREFIX = i686-linux-android- -#COMPILER_VERSION = 4.8 +#TARGET_ARCH = x86 +#CROSS_CC = clang +#CROSS_CXX = clang++ +#COMPILER_VERSION = clang +#HAVE_LEVELDB = 0 ################################################################################ ASSETS_TIMESTAMP = deps/assets_timestamp -LEVELDB_DIR = $(ROOT)/deps/leveldb/ +LEVELDB_DIR = $(ANDR_ROOT)/deps/leveldb/ LEVELDB_LIB = $(LEVELDB_DIR)libleveldb.a LEVELDB_TIMESTAMP = $(LEVELDB_DIR)/timestamp -LEVELDB_TIMESTAMP_INT = $(ROOT)/deps/leveldb_timestamp -LEVELDB_URL_GIT = https://code.google.com/p/leveldb/ +LEVELDB_TIMESTAMP_INT = $(ANDR_ROOT)/deps/leveldb_timestamp +LEVELDB_URL_GIT = https://github.com/google/leveldb +LEVELDB_COMMIT = 2d0320a458d0e6a20fff46d5f80b18bfdcce7018 -OPENAL_DIR = $(ROOT)/deps/openal-soft/ +OPENAL_DIR = $(ANDR_ROOT)/deps/openal-soft/ OPENAL_LIB = $(OPENAL_DIR)libs/$(TARGET_ABI)/libopenal.so OPENAL_TIMESTAMP = $(OPENAL_DIR)/timestamp -OPENAL_TIMESTAMP_INT = $(ROOT)/deps/openal_timestamp +OPENAL_TIMESTAMP_INT = $(ANDR_ROOT)/deps/openal_timestamp OPENAL_URL_GIT = https://github.com/apportable/openal-soft -OGG_DIR = $(ROOT)/deps/libvorbis-libogg-android/ +OGG_DIR = $(ANDR_ROOT)/deps/libvorbis-libogg-android/ OGG_LIB = $(OGG_DIR)libs/$(TARGET_ABI)/libogg.so VORBIS_LIB = $(OGG_DIR)libs/$(TARGET_ABI)/libogg.so OGG_TIMESTAMP = $(OGG_DIR)timestamp -OGG_TIMESTAMP_INT = $(ROOT)/deps/ogg_timestamp -OGG_URL_GIT = https://github.com/vincentjames501/libvorbis-libogg-android +OGG_TIMESTAMP_INT = $(ANDR_ROOT)/deps/ogg_timestamp +OGG_URL_GIT = https://gitlab.com/minetest/libvorbis-libogg-android -IRRLICHT_DIR = $(ROOT)/deps/irrlicht/ +IRRLICHT_REVISION = 5150 +IRRLICHT_DIR = $(ANDR_ROOT)/deps/irrlicht/ IRRLICHT_LIB = $(IRRLICHT_DIR)lib/Android/libIrrlicht.a IRRLICHT_TIMESTAMP = $(IRRLICHT_DIR)timestamp -IRRLICHT_TIMESTAMP_INT = $(ROOT)/deps/irrlicht_timestamp -IRRLICHT_URL_SVN = http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es/ +IRRLICHT_TIMESTAMP_INT = $(ANDR_ROOT)/deps/irrlicht_timestamp +IRRLICHT_URL_SVN = https://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@$(IRRLICHT_REVISION) -OPENSSL_BASEDIR = openssl-android -OPENSSL_DIR = $(ROOT)/deps/$(OPENSSL_BASEDIR)/ -OPENSSL_LIB = $(OPENSSL_DIR)libs/$(TARGET_ABI)/libopenssl.so +OPENSSL_VERSION = 1.0.2n +OPENSSL_BASEDIR = openssl-$(OPENSSL_VERSION) +OPENSSL_DIR = $(ANDR_ROOT)/deps/$(OPENSSL_BASEDIR)/ +OPENSSL_LIB = $(OPENSSL_DIR)/libssl.a OPENSSL_TIMESTAMP = $(OPENSSL_DIR)timestamp -OPENSSL_TIMESTAMP_INT = $(ROOT)/deps/openssl_timestamp -OPENSSL_URL_GIT = https://github.com/wobbals/openssl-android +OPENSSL_TIMESTAMP_INT = $(ANDR_ROOT)/deps/openssl_timestamp +OPENSSL_URL = https://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz -CURL_VERSION = 7.35.0 -CURL_DIR = $(ROOT)/deps/curl-$(CURL_VERSION) +CURL_VERSION = 7.60.0 +CURL_DIR = $(ANDR_ROOT)/deps/curl-$(CURL_VERSION) CURL_LIB = $(CURL_DIR)/lib/.libs/libcurl.a CURL_TIMESTAMP = $(CURL_DIR)/timestamp -CURL_TIMESTAMP_INT = $(ROOT)/deps/curl_timestamp -CURL_URL_HTTP = http://curl.haxx.se/download/curl-${CURL_VERSION}.tar.bz2 +CURL_TIMESTAMP_INT = $(ANDR_ROOT)/deps/curl_timestamp +CURL_URL_HTTP = https://curl.haxx.se/download/curl-${CURL_VERSION}.tar.bz2 -FREETYPE_DIR = $(ROOT)/deps/freetype2-android/ -FREETYPE_LIB = $(FREETYPE_DIR)/Android/obj/local/$(TARGER_ABI)/libfreetype2-static.a +FREETYPE_DIR = $(ANDR_ROOT)/deps/freetype2-android/ +FREETYPE_LIB = $(FREETYPE_DIR)/Android/obj/local/$(TARGET_ABI)/libfreetype2-static.a FREETYPE_TIMESTAMP = $(FREETYPE_DIR)timestamp -FREETYPE_TIMESTAMP_INT = $(ROOT)/deps/freetype_timestamp +FREETYPE_TIMESTAMP_INT = $(ANDR_ROOT)/deps/freetype_timestamp FREETYPE_URL_GIT = https://github.com/cdave1/freetype2-android --include $(PATHCFGFILE) +ICONV_VERSION = 1.14 +ICONV_DIR = $(ANDR_ROOT)/deps/libiconv/ +ICONV_LIB = $(ICONV_DIR)/lib/.libs/libiconv.so +ICONV_TIMESTAMP = $(ICONV_DIR)timestamp +ICONV_TIMESTAMP_INT = $(ANDR_ROOT)/deps/iconv_timestamp +ICONV_URL_HTTP = https://ftp.gnu.org/pub/gnu/libiconv/libiconv-$(ICONV_VERSION).tar.gz + +SQLITE3_FOLDER = sqlite-amalgamation-3240000 +SQLITE3_URL = https://www.sqlite.org/2018/$(SQLITE3_FOLDER).zip + +ANDROID_SDK = $(shell grep '^sdk\.dir' local.properties | sed 's/^.*=[[:space:]]*//') +ANDROID_NDK = $(shell grep '^ndk\.dir' local.properties | sed 's/^.*=[[:space:]]*//') + +#use interim target variable to switch leveldb on or off +ifeq ($(HAVE_LEVELDB),1) + LEVELDB_TARGET = $(LEVELDB_LIB) +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 \ - install_debug install envpaths all \ - manifest clean_manifest\ + install_debug install_release envpaths all \ $(ASSETS_TIMESTAMP) $(LEVELDB_TIMESTAMP) \ $(OPENAL_TIMESTAMP) $(OGG_TIMESTAMP) \ $(IRRLICHT_TIMESTAMP) $(CURL_TIMESTAMP) \ - $(OPENSSL_TIMESTAMP) curl_binary \ - $(ROOT)/jni/src/android_version.h + $(OPENSSL_TIMESTAMP) \ + $(ANDR_ROOT)/jni/src/android_version.h \ + $(ANDR_ROOT)/jni/src/android_version_githash.h -debug : $(PATHCFGFILE) +debug : local.properties export NDEBUG=; \ export BUILD_TYPE=debug; \ - $(MAKE) -j${PARALLEL} apk - + $(MAKE) apk + all : debug release - -release : $(PATHCFGFILE) + +release : local.properties @export NDEBUG=1; \ export BUILD_TYPE=release; \ - $(MAKE) -j${PARALLEL} apk + $(MAKE) apk reconfig: delconfig - @$(MAKE) -j${PARALLEL} $(PATHCFGFILE) + @$(MAKE) local.properties -delconfig : - $(RM) ${PATHCFGFILE} +delconfig: + $(RM) local.properties -$(PATHCFGFILE) : +local.properties: @echo "Please specify path of ANDROID NDK"; \ - echo "e.g. /home/user/android-ndk-r9c/"; \ + echo "e.g. $$HOME/Android/Sdk/ndk-bundle/"; \ read ANDROID_NDK ; \ if [ ! -d $$ANDROID_NDK ] ; then \ echo "$$ANDROID_NDK is not a valid folder"; \ exit 1; \ fi; \ - echo "ANDROID_NDK = $$ANDROID_NDK" > ${PATHCFGFILE}; \ - echo "NDK_MODULE_PATH = $$ANDROID_NDK/tools" >> ${PATHCFGFILE}; \ - echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";\ - echo "+ Note: NDK_MODULE_PATH is set to $$ANDROID_NDK/tools"; \ - echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";\ + echo "ndk.dir = $$ANDROID_NDK" > local.properties; \ echo "Please specify path of ANDROID SDK"; \ - echo "e.g. /home/user/adt-bundle-linux-x86_64-20131030/sdk/"; \ + echo "e.g. $$HOME/Android/Sdk/"; \ read SDKFLDR ; \ if [ ! -d $$SDKFLDR ] ; then \ echo "$$SDKFLDR is not a valid folder"; \ exit 1; \ fi; \ - echo "SDKFOLDER = $$SDKFLDR" >> ${PATHCFGFILE}; + echo "sdk.dir = $$SDKFLDR" >> local.properties; + $(OPENAL_TIMESTAMP) : openal_download @LAST_MODIF=$$(find ${OPENAL_DIR} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \ if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then \ touch ${OPENAL_TIMESTAMP}; \ fi - + openal_download : @if [ ! -d ${OPENAL_DIR} ] ; then \ echo "openal sources missing, downloading..."; \ - mkdir -p ${ROOT}/deps; \ - cd ${ROOT}/deps ; \ + mkdir -p ${ANDR_ROOT}/deps; \ + cd ${ANDR_ROOT}/deps ; \ git clone ${OPENAL_URL_GIT} || exit 1; \ fi - + openal : $(OPENAL_LIB) $(OPENAL_LIB): $(OPENAL_TIMESTAMP) - @REFRESH=0; \ + + @REFRESH=0; \ if [ ! -e ${OPENAL_TIMESTAMP_INT} ] ; then \ REFRESH=1; \ fi; \ @@ -201,43 +207,44 @@ $(OPENAL_LIB): $(OPENAL_TIMESTAMP) REFRESH=1; \ fi; \ if [ $$REFRESH -ne 0 ] ; then \ - export PATH=$$PATH:${SDKFOLDER}/platform-tools:${ANDROID_NDK}; \ echo "changed timestamp for openal detected building..."; \ cd ${OPENAL_DIR}; \ - ndk-build NDEBUG=${NDEBUG} NDK_MODULE_PATH=${NDK_MODULE_PATH} \ - APP_ABI=${TARGET_ABI} APP_PLATFORM=${APP_PLATFORM} -j${PARALLEL} \ - TARGET_CFLAGS+="${TARGET_CFLAGS_ADDON}" \ - TARGET_LDFLAGS+="${TARGET_LDFLAGS_ADDON}" \ - TARGET_CXXFLAGS+="${TARGET_CXXFLAGS_ADDON}" || exit 1; \ + export APP_PLATFORM=${APP_PLATFORM}; \ + export TARGET_ABI=${TARGET_ABI}; \ + export TARGET_CFLAGS_ADDON="${TARGET_CFLAGS_ADDON}"; \ + export TARGET_CXXFLAGS_ADDON="${TARGET_CXXFLAGS_ADDON}"; \ + export COMPILER_VERSION=${COMPILER_VERSION}; \ + ${ANDROID_NDK}/ndk-build \ + NDK_APPLICATION_MK=${ANDR_ROOT}/jni/Deps.mk || exit 1; \ touch ${OPENAL_TIMESTAMP}; \ touch ${OPENAL_TIMESTAMP_INT}; \ else \ echo "nothing to be done for openal"; \ fi - + clean_openal : $(RM) -rf ${OPENAL_DIR} - + $(OGG_TIMESTAMP) : ogg_download @LAST_MODIF=$$(find ${OGG_DIR} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \ if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then \ touch ${OGG_TIMESTAMP}; \ fi - + ogg_download : @if [ ! -d ${OGG_DIR} ] ; then \ echo "ogg sources missing, downloading..."; \ - mkdir -p ${ROOT}/deps; \ - cd ${ROOT}/deps ; \ + mkdir -p ${ANDR_ROOT}/deps; \ + cd ${ANDR_ROOT}/deps ; \ git clone ${OGG_URL_GIT}|| exit 1; \ cd libvorbis-libogg-android ; \ - patch -p1 < ../../libvorbis-libogg-fpu.patch || exit 1; \ + patch -p1 < ${ANDR_ROOT}/patches/libvorbis-libogg-fpu.patch || exit 1; \ fi - + ogg : $(OGG_LIB) $(OGG_LIB): $(OGG_TIMESTAMP) - @REFRESH=0; \ + + @REFRESH=0; \ if [ ! -e ${OGG_TIMESTAMP_INT} ] ; then \ echo "${OGG_TIMESTAMP_INT} doesn't exist"; \ REFRESH=1; \ @@ -246,14 +253,14 @@ $(OGG_LIB): $(OGG_TIMESTAMP) REFRESH=1; \ fi; \ if [ $$REFRESH -ne 0 ] ; then \ - export PATH=$$PATH:${SDKFOLDER}/platform-tools:${ANDROID_NDK}; \ echo "changed timestamp for ogg detected building..."; \ cd ${OGG_DIR}; \ - ndk-build NDEBUG=${NDEBUG} NDK_MODULE_PATH=${NDK_MODULE_PATH} \ - APP_ABI=${TARGET_ABI} APP_PLATFORM=${APP_PLATFORM} -j${PARALLEL} \ - TARGET_CFLAGS+="${TARGET_CFLAGS_ADDON}" \ - TARGET_LDFLAGS+="${TARGET_LDFLAGS_ADDON}" \ - TARGET_CXXFLAGS+="${TARGET_CXXFLAGS_ADDON}" || exit 1; \ + export APP_PLATFORM=${APP_PLATFORM}; \ + export TARGET_ABI=${TARGET_ABI}; \ + ${ANDROID_NDK}/build/tools/make-standalone-toolchain.sh \ + --toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION} \ + --platform=${APP_PLATFORM} \ + --install-dir=$${TOOLCHAIN}; \ touch ${OGG_TIMESTAMP}; \ touch ${OGG_TIMESTAMP_INT}; \ else \ @@ -262,21 +269,25 @@ $(OGG_LIB): $(OGG_TIMESTAMP) clean_ogg : $(RM) -rf ${OGG_DIR} - + $(OPENSSL_TIMESTAMP) : openssl_download @LAST_MODIF=$$(find ${OPENSSL_DIR} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \ if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then \ touch ${OPENSSL_TIMESTAMP}; \ fi - + openssl_download : @if [ ! -d ${OPENSSL_DIR} ] ; then \ echo "openssl sources missing, downloading..."; \ - mkdir -p ${ROOT}/deps; \ - cd ${ROOT}/deps ; \ - git clone ${OPENSSL_URL_GIT} || exit 1; \ + mkdir -p ${ANDR_ROOT}/deps; \ + cd ${ANDR_ROOT}/deps ; \ + wget ${OPENSSL_URL} || exit 1; \ + tar -xzf ${OPENSSL_BASEDIR}.tar.gz; \ + cd ${OPENSSL_BASEDIR}; \ + patch -p1 < ${ANDR_ROOT}/patches/openssl_arch.patch; \ + sed -i 's/-mandroid //g' Configure; \ fi - + openssl : $(OPENSSL_LIB) $(OPENSSL_LIB): $(OPENSSL_TIMESTAMP) @@ -289,24 +300,33 @@ $(OPENSSL_LIB): $(OPENSSL_TIMESTAMP) REFRESH=1; \ fi; \ if [ $$REFRESH -ne 0 ] ; then \ - export PATH=$$PATH:${SDKFOLDER}/platform-tools:${ANDROID_NDK}; \ echo "changed timestamp for openssl detected building..."; \ cd ${OPENSSL_DIR}; \ - cat jni/Application.mk | grep -v NDK_TOOLCHAIN_VERSION >jni/Application.mk.new;\ - mv jni/Application.mk.new jni/Application.mk; \ - ndk-build NDEBUG=${NDEBUG} NDK_MODULE_PATH=${NDK_MODULE_PATH} \ - APP_ABI=${TARGET_ABI} APP_PLATFORM=${APP_PLATFORM} -j${PARALLEL} \ - TARGET_CFLAGS+="${TARGET_CFLAGS_ADDON}" \ - TARGET_LDFLAGS+="${TARGET_LDFLAGS_ADDON}" \ - TARGET_CXXFLAGS+="${TARGET_CXXFLAGS_ADDON}" || exit 1; \ + ln -s ${OPENSSL_DIR} ../openssl; \ + export TOOLCHAIN=/tmp/ndk-${TARGET_HOST}-openssl; \ + ${ANDROID_NDK}/build/tools/make-standalone-toolchain.sh \ + --toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION} \ + --platform=${APP_PLATFORM} \ + --stl=libc++ \ + --install-dir=$${TOOLCHAIN}; \ + export PATH="$${TOOLCHAIN}/bin:$${PATH}"; \ + export CFLAGS="$${CFLAGS} ${TARGET_CFLAGS_ADDON}"; \ + export LDFLAGS="$${LDFLAGS} ${TARGET_LDFLAGS_ADDON}"; \ + CC=${CROSS_CC} ./Configure -DL_ENDIAN no-asm android-${TARGET_ARCH} \ + -D__ANDROID_API__=$(API); \ + CC=${CROSS_CC} ANDROID_DEV=/tmp/ndk-${TARGET_HOST} make depend; \ + CC=${CROSS_CC} ANDROID_DEV=/tmp/ndk-${TARGET_HOST} make build_libs; \ touch ${OPENSSL_TIMESTAMP}; \ touch ${OPENSSL_TIMESTAMP_INT}; \ + $(RM) -rf $${TOOLCHAIN}; \ else \ echo "nothing to be done for openssl"; \ fi clean_openssl : - $(RM) -rf ${OPENSSL_DIR} + $(RM) -rf ${OPENSSL_DIR}; \ + $(RM) -rf $(ANDR_ROOT)/deps/${OPENSSL_BASEDIR}.tar.gz; \ + $(RM) -rf $(ANDR_ROOT)/deps/openssl $(LEVELDB_TIMESTAMP) : leveldb_download @LAST_MODIF=$$(find ${LEVELDB_DIR} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \ @@ -317,13 +337,15 @@ $(LEVELDB_TIMESTAMP) : leveldb_download leveldb_download : @if [ ! -d ${LEVELDB_DIR} ] ; then \ echo "leveldb sources missing, downloading..."; \ - mkdir -p ${ROOT}/deps; \ - cd ${ROOT}/deps ; \ + mkdir -p ${ANDR_ROOT}/deps; \ + cd ${ANDR_ROOT}/deps ; \ git clone ${LEVELDB_URL_GIT} || exit 1; \ + cd ${LEVELDB_DIR} || exit 1; \ + git checkout ${LEVELDB_COMMIT} || exit 1; \ fi - -leveldb : $(LEVELDB_LIB) +leveldb : $(LEVELDB_LIB) +ifeq ($(HAVE_LEVELDB),1) $(LEVELDB_LIB): $(LEVELDB_TIMESTAMP) @REFRESH=0; \ if [ ! -e ${LEVELDB_TIMESTAMP_INT} ] ; then \ @@ -333,31 +355,34 @@ $(LEVELDB_LIB): $(LEVELDB_TIMESTAMP) REFRESH=1; \ fi; \ if [ $$REFRESH -ne 0 ] ; then \ - export PATH=$${PATH}:${SDKFOLDER}/platform-tools:${ANDROID_NDK}; \ echo "changed timestamp for leveldb detected building..."; \ cd deps/leveldb; \ - export CROSS_PREFIX=${CROSS_PREFIX}; \ - export TOOLCHAIN=/tmp/ndk-arm; \ + export CROSS_PREFIX=${TARGET_TOOLCHAIN}; \ + export TOOLCHAIN=/tmp/ndk-${TARGET_HOST}-leveldb; \ ${ANDROID_NDK}/build/tools/make-standalone-toolchain.sh \ - --toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION} \ - --install-dir=$${TOOLCHAIN} --system=linux-x86_64; \ + --toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION} \ + --platform=${APP_PLATFORM} \ + --stl=libc++ \ + --install-dir=$${TOOLCHAIN}; \ export PATH="$${TOOLCHAIN}/bin:$${PATH}"; \ - export CC=${CROSS_PREFIX}gcc; \ - export CXX=${CROSS_PREFIX}g++; \ + export CC=${CROSS_CC}; \ + export CXX=${CROSS_CXX}; \ export CFLAGS="$${CFLAGS} ${TARGET_CFLAGS_ADDON}"; \ - export CPPFLAGS="$${CPPFLAGS} ${TARGET_CFLAGS_ADDON}"; \ + export CPPFLAGS="$${CPPFLAGS} ${TARGET_CXXFLAGS_ADDON}"; \ export LDFLAGS="$${LDFLAGS} ${TARGET_LDFLAGS_ADDON}"; \ export TARGET_OS=OS_ANDROID_CROSSCOMPILE; \ - $(MAKE) -j${PARALLEL} -s || exit 1; \ + $(MAKE) || exit 1; \ touch ${LEVELDB_TIMESTAMP}; \ touch ${LEVELDB_TIMESTAMP_INT}; \ + $(RM) -rf $${TOOLCHAIN}; \ else \ echo "nothing to be done for leveldb"; \ fi - +endif + clean_leveldb : - $(RM) -rf deps/leveldb - + ./gradlew cleanLevelDB + $(FREETYPE_TIMESTAMP) : freetype_download @LAST_MODIF=$$(find ${FREETYPE_DIR} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \ if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then \ @@ -367,21 +392,15 @@ $(FREETYPE_TIMESTAMP) : freetype_download freetype_download : @if [ ! -d ${FREETYPE_DIR} ] ; then \ echo "freetype sources missing, downloading..."; \ - mkdir -p ${ROOT}/deps; \ + mkdir -p ${ANDR_ROOT}/deps; \ cd deps; \ git clone ${FREETYPE_URL_GIT} || exit 1; \ fi - -$(IRRLICHT_TIMESTAMP) : irrlicht_download - @LAST_MODIF=$$(find ${IRRLICHT_DIR} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \ - if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then \ - touch ${IRRLICHT_TIMESTAMP}; \ - fi - + freetype : $(FREETYPE_LIB) $(FREETYPE_LIB) : $(FREETYPE_TIMESTAMP) - @REFRESH=0; \ + + @REFRESH=0; \ if [ ! -e ${FREETYPE_TIMESTAMP_INT} ] ; then \ REFRESH=1; \ fi; \ @@ -393,22 +412,86 @@ $(FREETYPE_LIB) : $(FREETYPE_TIMESTAMP) fi; \ if [ $$REFRESH -ne 0 ] ; then \ mkdir -p ${FREETYPE_DIR}; \ - export PATH=$$PATH:${SDKFOLDER}/platform-tools:${ANDROID_NDK}; \ echo "changed timestamp for freetype detected building..."; \ cd ${FREETYPE_DIR}/Android/jni; \ - ndk-build NDEBUG=${NDEBUG} NDK_MODULE_PATH=${NDK_MODULE_PATH} \ - APP_PLATFORM=${APP_PLATFORM} APP_ABI=${TARGET_ABI} -j${PARALLEL} \ - TARGET_CFLAGS+="${TARGET_CFLAGS_ADDON}" \ - TARGET_LDFLAGS+="${TARGET_LDFLAGS_ADDON}" \ - TARGET_CXXFLAGS+="${TARGET_CXXFLAGS_ADDON}" || exit 1; \ + export APP_PLATFORM=${APP_PLATFORM}; \ + export TARGET_ABI=${TARGET_ABI}; \ + export TARGET_CFLAGS_ADDON="${TARGET_CFLAGS_ADDON}"; \ + export TARGET_CXXFLAGS_ADDON="${TARGET_CXXFLAGS_ADDON}"; \ + export COMPILER_VERSION=${COMPILER_VERSION}; \ + ${ANDROID_NDK}/ndk-build \ + NDK_APPLICATION_MK=${ANDR_ROOT}/jni/Deps.mk || exit 1; \ touch ${FREETYPE_TIMESTAMP}; \ touch ${FREETYPE_TIMESTAMP_INT}; \ else \ echo "nothing to be done for freetype"; \ fi - + clean_freetype : - $(RM) -rf ${FREETYPE_DIR} + ./gradlew cleanFreetype + +$(ICONV_TIMESTAMP) : iconv_download + @LAST_MODIF=$$(find ${ICONV_DIR} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \ + if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then \ + touch ${ICONV_TIMESTAMP}; \ + fi + +iconv_download : + @if [ ! -d ${ICONV_DIR} ] ; then \ + echo "iconv sources missing, downloading..."; \ + mkdir -p ${ANDR_ROOT}/deps; \ + cd ${ANDR_ROOT}/deps; \ + wget ${ICONV_URL_HTTP} || exit 1; \ + tar -xzf libiconv-${ICONV_VERSION}.tar.gz || exit 1; \ + rm libiconv-${ICONV_VERSION}.tar.gz; \ + ln -s libiconv-${ICONV_VERSION} libiconv; \ + cd ${ICONV_DIR}; \ + patch -p1 < ${ANDR_ROOT}/patches/libiconv_android.patch; \ + patch -p1 < ${ANDR_ROOT}/patches/libiconv_stdio.patch; \ + fi + +iconv : $(ICONV_LIB) + +$(ICONV_LIB) : $(ICONV_TIMESTAMP) + @REFRESH=0; \ + if [ ! -e ${ICONV_TIMESTAMP_INT} ] ; then \ + REFRESH=1; \ + fi; \ + if [ ! -e ${ICONV_LIB} ] ; then \ + REFRESH=1; \ + fi; \ + if [ ${ICONV_TIMESTAMP} -nt ${ICONV_TIMESTAMP_INT} ] ; then \ + REFRESH=1; \ + fi; \ + if [ $$REFRESH -ne 0 ] ; then \ + mkdir -p ${ICONV_DIR}; \ + echo "changed timestamp for iconv detected building..."; \ + cd ${ICONV_DIR}; \ + export TOOLCHAIN=/tmp/ndk-${TARGET_HOST}-iconv; \ + ${ANDROID_NDK}/build/tools/make-standalone-toolchain.sh \ + --toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION} \ + --platform=${APP_PLATFORM} \ + --stl=libc++ \ + --install-dir=$${TOOLCHAIN}; \ + export PATH="$${TOOLCHAIN}/bin:$${PATH}"; \ + export CFLAGS="$${CFLAGS} ${TARGET_CFLAGS_ADDON}"; \ + export LDFLAGS="$${LDFLAGS} ${TARGET_LDFLAGS_ADDON} -lstdc++"; \ + export CC=${CROSS_CC}; \ + export CXX=${CROSS_CXX}; \ + export TARGET_OS=OS_ANDROID_CROSSCOMPILE; \ + ./configure --host=${TARGET_HOST} || exit 1; \ + sed -i 's/LIBICONV_VERSION_INFO) /LIBICONV_VERSION_INFO) -avoid-version /g' lib/Makefile; \ + grep "iconv_LDFLAGS" src/Makefile; \ + $(MAKE) -s || exit 1; \ + touch ${ICONV_TIMESTAMP}; \ + touch ${ICONV_TIMESTAMP_INT}; \ + rm -rf ${TOOLCHAIN}; \ + else \ + echo "nothing to be done for iconv"; \ + fi + +clean_iconv : + ./gradlew cleanIconv #Note: Texturehack patch is required for gpu's not supporting color format # correctly. Known bad GPU: @@ -418,19 +501,26 @@ clean_freetype : irrlicht_download : @if [ ! -d "deps/irrlicht" ] ; then \ echo "irrlicht sources missing, downloading..."; \ - mkdir -p ${ROOT}/deps; \ + mkdir -p ${ANDR_ROOT}/deps; \ cd deps; \ svn co ${IRRLICHT_URL_SVN} irrlicht || exit 1; \ cd irrlicht; \ - patch -p1 < ../../irrlicht-touchcount.patch || exit 1; \ - patch -p1 < ../../irrlicht-back_button.patch || exit 1; \ - patch -p1 < ../../irrlicht-texturehack.patch || exit 1; \ + patch -p1 < ${ANDR_ROOT}/patches/irrlicht-touchcount.patch || exit 1; \ + patch -p1 < ${ANDR_ROOT}/patches/irrlicht-back_button.patch || exit 1; \ + patch -p1 < ${ANDR_ROOT}/patches/irrlicht-texturehack.patch || exit 1; \ + patch -p1 < ${ANDR_ROOT}/patches/irrlicht-native_activity.patch || exit 1; \ + fi + +$(IRRLICHT_TIMESTAMP) : irrlicht_download + @LAST_MODIF=$$(find ${IRRLICHT_DIR} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \ + if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then \ + touch ${IRRLICHT_TIMESTAMP}; \ fi irrlicht : $(IRRLICHT_LIB) $(IRRLICHT_LIB): $(IRRLICHT_TIMESTAMP) $(FREETYPE_LIB) - @REFRESH=0; \ + + @REFRESH=0; \ if [ ! -e ${IRRLICHT_TIMESTAMP_INT} ] ; then \ REFRESH=1; \ fi; \ @@ -442,23 +532,24 @@ $(IRRLICHT_LIB): $(IRRLICHT_TIMESTAMP) $(FREETYPE_LIB) fi; \ if [ $$REFRESH -ne 0 ] ; then \ mkdir -p ${IRRLICHT_DIR}; \ - export PATH=$$PATH:${SDKFOLDER}/platform-tools:${ANDROID_NDK}; \ echo "changed timestamp for irrlicht detected building..."; \ cd deps/irrlicht/source/Irrlicht/Android; \ - ndk-build NDEBUG=${NDEBUG} NDK_MODULE_PATH=${NDK_MODULE_PATH} \ - APP_ABI=${TARGET_ABI} APP_PLATFORM=${APP_PLATFORM} -j${PARALLEL} \ - TARGET_CFLAGS+="${TARGET_CFLAGS_ADDON}" \ - TARGET_LDFLAGS+="${TARGET_LDFLAGS_ADDON}" \ - TARGET_CXXFLAGS+="${TARGET_CXXFLAGS_ADDON}" || exit 1; \ + export APP_PLATFORM=${APP_PLATFORM}; \ + export TARGET_ABI=${TARGET_ABI}; \ + export TARGET_CFLAGS_ADDON="${TARGET_CFLAGS_ADDON}"; \ + export TARGET_CXXFLAGS_ADDON="${TARGET_CXXFLAGS_ADDON}"; \ + export COMPILER_VERSION=${COMPILER_VERSION}; \ + ${ANDROID_NDK}/ndk-build \ + NDK_APPLICATION_MK=${ANDR_ROOT}/jni/Deps.mk || exit 1; \ touch ${IRRLICHT_TIMESTAMP}; \ touch ${IRRLICHT_TIMESTAMP_INT}; \ else \ echo "nothing to be done for irrlicht"; \ fi - + clean_irrlicht : - $(RM) -rf deps/irrlicht - + ./gradlew cleanIrrlicht + $(CURL_TIMESTAMP) : curl_download @LAST_MODIF=$$(find ${CURL_DIR} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \ if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then \ @@ -468,11 +559,12 @@ $(CURL_TIMESTAMP) : curl_download curl_download : @if [ ! -d "deps/curl-${CURL_VERSION}" ] ; then \ echo "curl sources missing, downloading..."; \ - mkdir -p ${ROOT}/deps; \ + mkdir -p ${ANDR_ROOT}/deps; \ cd deps; \ 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) @@ -490,105 +582,72 @@ $(CURL_LIB): $(CURL_TIMESTAMP) $(OPENSSL_LIB) fi; \ if [ $$REFRESH -ne 0 ] ; then \ mkdir -p ${CURL_DIR}; \ - export PATH="$${PATH}:${SDKFOLDER}/platform-tools:${ANDROID_NDK}"; \ echo "changed timestamp for curl detected building..."; \ cd deps/curl-${CURL_VERSION}; \ - export CROSS_PREFIX=${CROSS_PREFIX}; \ - export TOOLCHAIN=/tmp/ndk-arm; \ + export CROSS_PREFIX=${TARGET_TOOLCHAIN}; \ + export TOOLCHAIN=/tmp/ndk-${TARGET_HOST}-curl; \ ${ANDROID_NDK}/build/tools/make-standalone-toolchain.sh \ - --toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION} \ - --install-dir=$${TOOLCHAIN} --system=linux-x86_64; \ + --toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION} \ + --platform=${APP_PLATFORM} \ + --stl=libc++ \ + --install-dir=$${TOOLCHAIN}; \ export PATH="$${TOOLCHAIN}/bin:$${PATH}"; \ - export CC=${CROSS_PREFIX}gcc; \ - export CXX=${CROSS_PREFIX}g++; \ + export CC=${CROSS_CC}; \ + export CXX=${CROSS_CXX}; \ export TARGET_OS=OS_ANDROID_CROSSCOMPILE; \ - export CPPFLAGS="$${CPPFLAGS} -I${OPENSSL_DIR}/include \ - -L${OPENSSL_DIR}/libs/${TARGET_ABI}/ ${TARGET_CFLAGS_ADDON}"; \ + export CPPFLAGS="$${CPPFLAGS} -I${OPENSSL_DIR}/include ${TARGET_CFLAGS_ADDON}"; \ export CFLAGS="$${CFLAGS} ${TARGET_CFLAGS_ADDON}"; \ - export LDFLAGS="$${LDFLAGS} -L${OPENSSL_DIR}/libs/${TARGET_ABI}/ \ - ${TARGET_LDFLAGS_ADDON}"; \ + export LDFLAGS="$${LDFLAGS} -L${OPENSSL_DIR} ${TARGET_LDFLAGS_ADDON}"; \ ./configure --host=${TARGET_HOST} --disable-shared --enable-static --with-ssl; \ - $(MAKE) -j${PARALLEL} -s || exit 1; \ + $(MAKE) -s || exit 1; \ touch ${CURL_TIMESTAMP}; \ touch ${CURL_TIMESTAMP_INT}; \ + $(RM) -rf $${TOOLCHAIN}; \ else \ echo "nothing to be done for curl"; \ fi - + clean_curl : - $(RM) -rf deps/curl-${CURL_VERSION} - - -curl_binary: - @if [ ! -d "deps/curl-${CURL_VERSION_BINARY}" ] ; then \ - echo "curl sources missing, downloading..."; \ - mkdir -p ${ROOT}/deps; \ - cd deps; \ - wget http://curl.haxx.se/gknw.net/7.34.0/dist-android/curl-7.34.0-rtmp-ssh2-ssl-zlib-static-bin-android.tar.gz || exit 1;\ - tar -xzf curl-7.34.0-rtmp-ssh2-ssl-zlib-static-bin-android.tar.gz || exit 1;\ - mv curl-7.34.0-rtmp-ssh2-ssl-zlib-static-bin-android curl-${CURL_VERSION_BINARY};\ - rm curl-7.34.0-rtmp-ssh2-ssl-zlib-static-bin-android.tar.gz; \ - fi + ./gradlew cleanCURL + +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; \ + cd ${SQLITE3_FOLDER}; + +clean_sqlite3: + ./gradlew cleanSQLite3 $(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" "); \ - if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then \ - touch ${ROOT}/../../builtin/timestamp; \ - touch ${ASSETS_TIMESTAMP}; \ - echo builtin changed $$LAST_MODIF; \ - fi; \ - LAST_MODIF=$$(find ${ROOT}/../../client -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \ - if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then \ - touch ${ROOT}/../../client/timestamp; \ - touch ${ASSETS_TIMESTAMP}; \ - fi; \ - LAST_MODIF=$$(find ${ROOT}/../../doc -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \ - if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then \ - touch ${ROOT}/../../doc/timestamp; \ - touch ${ASSETS_TIMESTAMP}; \ - fi; \ - LAST_MODIF=$$(find ${ROOT}/../../fonts -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \ - if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then \ - touch ${ROOT}/../../fonts/timestamp; \ - touch ${ASSETS_TIMESTAMP}; \ - fi; \ - LAST_MODIF=$$(find ${ROOT}/../../games -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \ - if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then \ - touch ${ROOT}/../../games/timestamp; \ - touch ${ASSETS_TIMESTAMP}; \ - fi; \ - LAST_MODIF=$$(find ${ROOT}/../../mods -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \ - if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then \ - touch ${ROOT}/../../mods/timestamp; \ - touch ${ASSETS_TIMESTAMP}; \ - fi; \ - LAST_MODIF=$$(find ${ROOT}/../../po -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \ - if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then \ - touch ${ROOT}/../../po/timestamp; \ - touch ${ASSETS_TIMESTAMP}; \ - fi; \ - LAST_MODIF=$$(find ${ROOT}/../../textures -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \ - if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then \ - touch ${ROOT}/../../textures/timestamp; \ - touch ${ASSETS_TIMESTAMP}; \ - fi; \ + @mkdir -p ${ANDR_ROOT}/deps; \ + for DIRNAME in {builtin,client,doc,fonts,games,mods,po,textures}; do \ + LAST_MODIF=$$(find ${PROJ_ROOT}/${DIRNAME} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \ + if [ $$(basename $$LAST_MODIF) != "timestamp" ]; then \ + touch ${PROJ_ROOT}/${DIRNAME}/timestamp; \ + touch ${ASSETS_TIMESTAMP}; \ + echo ${DIRNAME} changed $$LAST_MODIF; \ + fi; \ + done; \ LAST_MODIF=$$(find ${IRRLICHT_DIR}/media -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \ if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then \ touch ${IRRLICHT_DIR}/media/timestamp; \ touch ${ASSETS_TIMESTAMP}; \ fi; \ - if [ ${ROOT}/../../minetest.conf.example -nt ${ASSETS_TIMESTAMP} ] ; then \ + if [ ${PROJ_ROOT}/minetest.conf.example -nt ${ASSETS_TIMESTAMP} ] ; then \ echo "conf changed"; \ touch ${ASSETS_TIMESTAMP}; \ fi; \ - if [ ${ROOT}/../../README.txt -nt ${ASSETS_TIMESTAMP} ] ; then \ + if [ ${PROJ_ROOT}/README.txt -nt ${ASSETS_TIMESTAMP} ] ; then \ touch ${ASSETS_TIMESTAMP}; \ fi; \ if [ ! -e $(ASSETS_TIMESTAMP) ] ; then \ touch $(ASSETS_TIMESTAMP); \ fi - + assets : $(ASSETS_TIMESTAMP) @REFRESH=0; \ if [ ! -e ${ASSETS_TIMESTAMP}.old ] ; then \ @@ -597,128 +656,111 @@ assets : $(ASSETS_TIMESTAMP) if [ ${ASSETS_TIMESTAMP} -nt ${ASSETS_TIMESTAMP}.old ] ; then \ REFRESH=1; \ fi; \ - if [ ! -d ${ROOT}/assets ] ; then \ + if [ ! -d ${APP_ROOT}/assets ] ; then \ REFRESH=1; \ fi; \ if [ $$REFRESH -ne 0 ] ; then \ echo "assets changed, refreshing..."; \ - $(MAKE) -j${PARALLEL} clean_assets; \ - mkdir -p ${ROOT}/assets/Minetest; \ - cp ${ROOT}/../../minetest.conf.example ${ROOT}/assets/Minetest; \ - cp ${ROOT}/../../README.txt ${ROOT}/assets/Minetest; \ - cp -r ${ROOT}/../../builtin ${ROOT}/assets/Minetest; \ - cp -r ${ROOT}/../../client ${ROOT}/assets/Minetest; \ - cp -r ${ROOT}/../../doc ${ROOT}/assets/Minetest; \ - cp -r ${ROOT}/../../fonts ${ROOT}/assets/Minetest; \ - cp -r ${ROOT}/../../games ${ROOT}/assets/Minetest; \ - cp -r ${ROOT}/../../mods ${ROOT}/assets/Minetest; \ - cp -r ${ROOT}/../../po ${ROOT}/assets/Minetest; \ - cp -r ${ROOT}/../../textures ${ROOT}/assets/Minetest; \ - mkdir -p ${ROOT}/assets/Minetest/media; \ - cp -r ${IRRLICHT_DIR}/media/Shaders ${ROOT}/assets/Minetest/media; \ - cd ${ROOT}/assets; \ + $(MAKE) clean_assets; \ + ./gradlew copyAssets; \ + cp -r ${IRRLICHT_DIR}/media/Shaders ${APP_ROOT}/assets/Minetest/media; \ + cd ${APP_ROOT}/assets || exit 1; \ find . -name "timestamp" -exec rm {} \; ; \ find . -name "*.blend" -exec rm {} \; ; \ + find . -name "*~" -exec rm {} \; ; \ + find . -type d -path "*.git" -exec rm -rf {} \; ; \ + find . -type d -path "*.svn" -exec rm -rf {} \; ; \ + find . -type f -path "*.gitignore" -exec rm -rf {} \; ; \ ls -R | grep ":$$" | sed -e 's/:$$//' -e 's/\.//' -e 's/^\///' > "index.txt"; \ - cp ${ROOT}/${ASSETS_TIMESTAMP} ${ROOT}/${ASSETS_TIMESTAMP}.old; \ + find -L Minetest > filelist.txt; \ + cp ${ANDR_ROOT}/${ASSETS_TIMESTAMP} ${ANDR_ROOT}/${ASSETS_TIMESTAMP}.old; \ else \ echo "nothing to be done for assets"; \ fi clean_assets : - @$(RM) -r assets - -apk: $(PATHCFGFILE) assets $(IRRLICHT_LIB) $(CURL_LIB) $(LEVELDB_LIB) \ - $(OPENAL_LIB) $(OGG_LIB) prep_srcdir $(ROOT)/jni/src/android_version.h - @export NDEBUG=$$NDEBUG; $(MAKE) -j${PARALLEL} manifest; \ - export PATH=$$PATH:${SDKFOLDER}/platform-tools:${ANDROID_NDK}; \ - export ANDROID_HOME=${SDKFOLDER}; \ - mkdir -p ${ROOT}/src; \ - ndk-build NDK_MODULE_PATH=${NDK_MODULE_PATH} -j${PARALLEL} \ - GPROF=${GPROF} APP_ABI=${TARGET_ABI} \ - APP_PLATFORM=${APP_PLATFORM} \ - TARGET_LIBDIR=${TARGET_LIBDIR} \ - TARGET_CFLAGS+="${TARGET_CFLAGS_ADDON}" \ - TARGET_LDFLAGS+="${TARGET_LDFLAGS_ADDON}" \ - TARGET_CXXFLAGS+="${TARGET_CXXFLAGS_ADDON}" && \ - ant $$BUILD_TYPE && \ - echo "++ Success!" && \ - echo "APK: bin/Minetest-$$BUILD_TYPE.apk" && \ - echo "You can install it with \`adb install -r bin/Minetest-$$BUILD_TYPE.apk\`" - + ./gradlew cleanAssets + +apk: local.properties assets $(ICONV_LIB) $(IRRLICHT_LIB) $(CURL_LIB) $(LEVELDB_TARGET) \ + $(OPENAL_LIB) $(OGG_LIB) prep_srcdir $(ANDR_ROOT)/jni/src/android_version.h \ + $(ANDR_ROOT)/jni/src/android_version_githash.h sqlite3_download + + @export TARGET_LIBDIR=${TARGET_LIBDIR}; \ + export HAVE_LEVELDB=${HAVE_LEVELDB}; \ + export APP_PLATFORM=${APP_PLATFORM}; \ + export TARGET_ABI=${TARGET_ABI}; \ + export TARGET_CFLAGS_ADDON="${TARGET_CFLAGS_ADDON}"; \ + export TARGET_CXXFLAGS_ADDON="${TARGET_CXXFLAGS_ADDON}"; \ + export COMPILER_VERSION=${COMPILER_VERSION}; \ + export GPROF=${GPROF}; \ + ${ANDROID_NDK}/ndk-build || exit 1; \ + if [ ! -e ${APP_ROOT}/jniLibs ]; then \ + ln -s ${ANDR_ROOT}/libs ${APP_ROOT}/jniLibs || exit 1; \ + fi; \ + export VERSION_STR="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" && \ + export BUILD_TYPE_C=$$(echo "$${BUILD_TYPE}" | sed 's/./\U&/') && \ + ./gradlew assemble$$BUILD_TYPE_C && \ + echo "APK stored at: build/outputs/apk/$$BUILD_TYPE/Minetest-$$BUILD_TYPE.apk" && \ + echo "You can install it with \`make install_$$BUILD_TYPE\`" + +# These Intentionally doesn't depend on their respective build steps, +# because it takes a while to verify that everything's up-to-date. +install_debug: + ${ANDROID_SDK}/platform-tools/adb install -r build/outputs/apk/debug/Minetest-debug.apk + +install_release: + ${ANDROID_SDK}/platform-tools/adb install -r build/outputs/apk/release/Minetest-release.apk + prep_srcdir : - @rm ${ROOT}/jni/src; \ - ln -s ${ROOT}/../../src ${ROOT}/jni/src - -clean_apk : manifest - @export PATH=$$PATH:${SDKFOLDER}platform-tools:${ANDROID_NDK}; \ - export ANDROID_HOME=${SDKFOLDER}; \ - ant clean - -install_debug : - @export PATH=$$PATH:${SDKFOLDER}platform-tools:${ANDROID_NDK}; \ - adb install -r ${ROOT}/bin/Minetest-debug.apk - -install : - @export PATH=$$PATH:${SDKFOLDER}platform-tools:${ANDROID_NDK}; \ - adb install -r ${ROOT}/bin/Minetest-release.apk - -envpaths : - @echo "export PATH=$$PATH:${SDKFOLDER}platform-tools:${ANDROID_NDK}" > and_env;\ - echo "export ANDROID_HOME=${SDKFOLDER}" >> and_env; - -clean_all : - @$(MAKE) -j${PARALLEL} clean_apk; \ - $(MAKE) clean_assets clean_irrlicht clean_leveldb clean_curl clean_openssl \ - clean_openal clean_ogg clean_manifest; \ - sleep 1; \ - $(RM) -r gen libs obj deps bin Debug and_env - -$(ROOT)/jni/src/android_version.h : - @echo "#define STR_HELPER(x) #x" \ - >${ROOT}/jni/src/android_version.h; \ - echo "#define STR(x) STR_HELPER(x)" \ - >> ${ROOT}/jni/src/android_version.h; \ - echo "#define VERSION_MAJOR $$(cat ${ROOT}/../../CMakeLists.txt | \ - grep ^set\(VERSION_MAJOR\ | sed 's/)/ /' | awk '{print $$2;}')" \ - >> ${ROOT}/jni/src/android_version.h; \ - echo "#define VERSION_MINOR $$(cat ${ROOT}/../../CMakeLists.txt | \ - grep ^set\(VERSION_MINOR\ | sed 's/)/ /' | awk '{print $$2;}')" \ - >> ${ROOT}/jni/src/android_version.h; \ - echo "#define VERSION_PATCH $$(cat ${ROOT}/../../CMakeLists.txt | \ - grep ^set\(VERSION_PATCH\ | sed 's/)/ /' | awk '{print $$2;}')" \ - >> ${ROOT}/jni/src/android_version.h; \ - echo "#define VERSION_PATCH_ORIG $$(cat ${ROOT}/../../CMakeLists.txt | \ - grep ^set\(VERSION_PATCH\ | sed 's/)/ /' | awk '{print $$2;}')" \ - >> ${ROOT}/jni/src/android_version.h; \ - echo "#define CMAKE_VERSION_GITHASH \"$$(git rev-parse --short=8 HEAD)\"" \ - >> ${ROOT}/jni/src/android_version.h; \ - echo "#define CMAKE_VERSION_STRING STR(VERSION_MAJOR)\".\"STR(VERSION_MINOR)\ - \".\"STR(VERSION_PATCH)" \ - >> ${ROOT}/jni/src/android_version.h; - -manifest : - @VERS_MAJOR=$$(cat ${ROOT}/../../CMakeLists.txt | \ - grep ^set\(VERSION_MAJOR\ | sed 's/)/ /' | awk '{print $$2;}'); \ - VERS_MINOR=$$(cat ${ROOT}/../../CMakeLists.txt | \ - grep ^set\(VERSION_MINOR\ | sed 's/)/ /' | awk '{print $$2;}'); \ - VERS_PATCH=$$(cat ${ROOT}/../../CMakeLists.txt | \ - grep ^set\(VERSION_PATCH\ | sed 's/)/ /' | awk '{print $$2;}'); \ - BASE_VERSION="$$VERS_MAJOR.$$VERS_MINOR.$$VERS_PATCH"; \ - if [ "${NDEBUG}x" != "x" ] ; then \ - DBG=''; \ - DBG_FLAG="android:debuggable=\"false\""; \ - else \ - DBG=""; \ - DBG_FLAG="android:debuggable=\"true\""; \ + @if [ ! -e ${ANDR_ROOT}/jni/src ]; then \ + ln -s ${PROJ_ROOT}/src ${ANDR_ROOT}/jni/src; \ fi; \ - cat ${ROOT}/AndroidManifest.xml.template | \ - sed s/###ANDROID_VERSION###/${ANDROID_VERSION_CODE}/g | \ - sed s/###BASE_VERSION###/$$BASE_VERSION/g | \ - sed -e "s@###DEBUG_BUILD###@$$DBG@g" | \ - sed -e "s@###DEBUG_FLAG###@$$DBG_FLAG@g" >${ROOT}/AndroidManifest.xml - -clean_manifest : - rm -rf ${ROOT}/AndroidManifest.xml + if [ ! -e ${ANDR_ROOT}/jni/lib ]; then \ + ln -s ${PROJ_ROOT}/lib ${ANDR_ROOT}/jni/lib; \ + fi + +clean_apk : + ./gradlew clean + +clean_all : + ./gradlew cleanAll + +$(ANDR_ROOT)/jni/src/android_version_githash.h : prep_srcdir + @export VERSION_FILE=${ANDR_ROOT}/jni/src/android_version_githash.h; \ + export VERSION_FILE_NEW=$${VERSION_FILE}.new; \ + { \ + echo "#ifndef ANDROID_MT_VERSION_GITHASH_H"; \ + echo "#define ANDROID_MT_VERSION_GITHASH_H"; \ + export GITHASH=$$(git rev-parse --short=8 HEAD); \ + export VERSION_STR="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}"; \ + echo "#define VERSION_GITHASH \"$$VERSION_STR-$$GITHASH-Android\""; \ + echo "#endif"; \ + } > "$${VERSION_FILE_NEW}"; \ + if ! cmp -s $${VERSION_FILE} $${VERSION_FILE_NEW}; then \ + echo "android_version_githash.h changed, updating..."; \ + mv "$${VERSION_FILE_NEW}" "$${VERSION_FILE}"; \ + else \ + rm "$${VERSION_FILE_NEW}"; \ + fi + + +$(ANDR_ROOT)/jni/src/android_version.h : prep_srcdir + @export VERSION_FILE=${ANDR_ROOT}/jni/src/android_version.h; \ + export VERSION_FILE_NEW=$${VERSION_FILE}.new; \ + { \ + echo "#ifndef ANDROID_MT_VERSION_H"; \ + echo "#define ANDROID_MT_VERSION_H"; \ + echo "#define VERSION_MAJOR ${VERSION_MAJOR}"; \ + echo "#define VERSION_MINOR ${VERSION_MINOR}"; \ + echo "#define VERSION_PATCH ${VERSION_PATCH}"; \ + echo "#define VERSION_STRING STR(VERSION_MAJOR) \".\" STR(VERSION_MINOR) \ + \".\" STR(VERSION_PATCH)"; \ + echo "#endif"; \ + } > $${VERSION_FILE_NEW}; \ + if ! cmp -s $${VERSION_FILE} $${VERSION_FILE_NEW}; then \ + echo "android_version.h changed, updating..."; \ + mv "$${VERSION_FILE_NEW}" "$${VERSION_FILE}"; \ + else \ + rm "$${VERSION_FILE_NEW}"; \ + fi clean : clean_apk clean_assets