diff options
| author | Nathanaël Courant <Ekdohibs@users.noreply.github.com> | 2017-04-16 00:48:48 -0700 |
|---|---|---|
| committer | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-04-16 09:48:48 +0200 |
| commit | d17636484dedab91b820667a82ec23cf6168ac7a (patch) | |
| tree | e06be7d745f5d613d57e2b4d4ab1f2bfebd4dc7b /build/android | |
| parent | 34d32ce55ae4f3f29d7b645075dc8efacb2c96d2 (diff) | |
| download | minetest-d17636484dedab91b820667a82ec23cf6168ac7a.tar.gz minetest-d17636484dedab91b820667a82ec23cf6168ac7a.tar.bz2 minetest-d17636484dedab91b820667a82ec23cf6168ac7a.zip | |
Disable android leveldb by default (#5596)
1) Now leveldb is brick (thanks google)
2) By default, use SQLite3, this work perfectly and NOBODY not use LevelDB on Android :)
Diffstat (limited to 'build/android')
| -rw-r--r-- | build/android/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/build/android/Makefile b/build/android/Makefile index 22700da93..2ee3f7dcc 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -35,7 +35,7 @@ TARGET_CXXFLAGS_ADDON = $(TARGET_CFLAGS_ADDON) TARGET_ARCH = armv7 CROSS_PREFIX = arm-linux-androideabi- COMPILER_VERSION = 4.9 -HAVE_LEVELDB = 1 +HAVE_LEVELDB = 0 ################################################################################ # toolchain config for little endian mips @@ -59,7 +59,7 @@ HAVE_LEVELDB = 1 #CROSS_PREFIX = i686-linux-android- #TARGET_ARCH = x86 #COMPILER_VERSION = 4.9 -#HAVE_LEVELDB = 1 +#HAVE_LEVELDB = 0 ################################################################################ ASSETS_TIMESTAMP = deps/assets_timestamp @@ -352,7 +352,7 @@ leveldb_download : fi leveldb : $(LEVELDB_LIB) - +ifeq ($(HAVE_LEVELDB),1) $(LEVELDB_LIB): $(LEVELDB_TIMESTAMP) @REFRESH=0; \ if [ ! -e ${LEVELDB_TIMESTAMP_INT} ] ; then \ @@ -384,6 +384,7 @@ $(LEVELDB_LIB): $(LEVELDB_TIMESTAMP) else \ echo "nothing to be done for leveldb"; \ fi +endif clean_leveldb : $(RM) -rf deps/leveldb |