diff options
| author | sapier <Sapier at GMX dot net> | 2014-07-07 23:10:26 +0200 |
|---|---|---|
| committer | sapier <Sapier at GMX dot net> | 2014-08-16 12:28:07 +0200 |
| commit | f6e01adab7ed2adbdc8f07b855d1ae4669c607c9 (patch) | |
| tree | ad690f650ab4d13387b70d7187718cc0b020f5ee /build/android/Makefile | |
| parent | fa427d641b687dd8585adced708510b94588cf51 (diff) | |
| download | minetest-f6e01adab7ed2adbdc8f07b855d1ae4669c607c9.tar.gz minetest-f6e01adab7ed2adbdc8f07b855d1ae4669c607c9.tar.bz2 minetest-f6e01adab7ed2adbdc8f07b855d1ae4669c607c9.zip | |
Makefile support for build without leveldb
Diffstat (limited to 'build/android/Makefile')
| -rw-r--r-- | build/android/Makefile | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/build/android/Makefile b/build/android/Makefile index 6528e839c..ba6ab3b74 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -36,6 +36,7 @@ TARGET_TOOLCHAIN = arm-linux-androideabi- TARGET_CFLAGS_ADDON = -mfloat-abi=softfp -mfpu=vfp CROSS_PREFIX = arm-linux-androideabi- COMPILER_VERSION = 4.8 +HAVE_LEVELDB = 1 ################################################################################ # toolchain config for arm new processors @@ -50,6 +51,7 @@ COMPILER_VERSION = 4.8 #TARGET_LDFLAGS_ADDON = -Wl,--no-warn-mismatch -lm_hard #CROSS_PREFIX = arm-linux-androideabi- #COMPILER_VERSION = 4.8 +#HAVE_LEVELDB = 1 ################################################################################ # toolchain config for little endian mips @@ -60,6 +62,7 @@ COMPILER_VERSION = 4.8 #TARGET_TOOLCHAIN = mipsel-linux-android- #CROSS_PREFIX = mipsel-linux-android- #COMPILER_VERSION = 4.8 +#HAVE_LEVELDB = 0 ################################################################################ # toolchain config for x86 @@ -70,6 +73,7 @@ COMPILER_VERSION = 4.8 #TARGET_TOOLCHAIN = x86- #CROSS_PREFIX = i686-linux-android- #COMPILER_VERSION = 4.8 +#HAVE_LEVELDB = 1 ################################################################################ ASSETS_TIMESTAMP = deps/assets_timestamp @@ -135,6 +139,11 @@ FREETYPE_URL_GIT = https://github.com/cdave1/freetype2-android $(IRRLICHT_TIMESTAMP) $(CURL_TIMESTAMP) \ $(OPENSSL_TIMESTAMP) curl_binary \ $(ROOT)/jni/src/android_version.h + +#use interim target variable to switch leveldb on or off +ifeq ($(HAVE_LEVELDB),1) + LEVELDB_TARGET = $(LEVELDB_LIB) +endif debug : $(PATHCFGFILE) export NDEBUG=; \ @@ -628,14 +637,14 @@ assets : $(ASSETS_TIMESTAMP) clean_assets : @$(RM) -r assets -apk: $(PATHCFGFILE) assets $(IRRLICHT_LIB) $(CURL_LIB) $(LEVELDB_LIB) \ +apk: $(PATHCFGFILE) assets $(IRRLICHT_LIB) $(CURL_LIB) $(LEVELDB_TARGET) \ $(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} \ + GPROF=${GPROF} APP_ABI=${TARGET_ABI} HAVE_LEVELDB=${HAVE_LEVELDB} \ APP_PLATFORM=${APP_PLATFORM} \ TARGET_LIBDIR=${TARGET_LIBDIR} \ TARGET_CFLAGS+="${TARGET_CFLAGS_ADDON}" \ |