minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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 :)
This commit is contained in:
Nathanaël Courant 2017-04-16 00:48:48 -07:00 committed by Loïc Blot
parent 34d32ce55a
commit d17636484d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build/android/Makefile
View File

@ -35,7 +35,7 @@ TARGET_CXXFLAGS_ADDON = $(TARGET_CFLAGS_ADDON)
TARGET_ARCH = armv7 TARGET_ARCH = armv7
CROSS_PREFIX = arm-linux-androideabi- CROSS_PREFIX = arm-linux-androideabi-
COMPILER_VERSION = 4.9 COMPILER_VERSION = 4.9
HAVE_LEVELDB = 1 HAVE_LEVELDB = 0
################################################################################ ################################################################################
# toolchain config for little endian mips # toolchain config for little endian mips
@ -59,7 +59,7 @@ HAVE_LEVELDB = 1
#CROSS_PREFIX = i686-linux-android- #CROSS_PREFIX = i686-linux-android-
#TARGET_ARCH = x86 #TARGET_ARCH = x86
#COMPILER_VERSION = 4.9 #COMPILER_VERSION = 4.9
#HAVE_LEVELDB = 1 #HAVE_LEVELDB = 0
################################################################################ ################################################################################
ASSETS_TIMESTAMP = deps/assets_timestamp ASSETS_TIMESTAMP = deps/assets_timestamp
@ -352,7 +352,7 @@ leveldb_download :
fi fi
leveldb : $(LEVELDB_LIB) leveldb : $(LEVELDB_LIB)
ifeq ($(HAVE_LEVELDB),1)
$(LEVELDB_LIB): $(LEVELDB_TIMESTAMP) $(LEVELDB_LIB): $(LEVELDB_TIMESTAMP)
@REFRESH=0; \ @REFRESH=0; \
if [ ! -e ${LEVELDB_TIMESTAMP_INT} ] ; then \ if [ ! -e ${LEVELDB_TIMESTAMP_INT} ] ; then \
@ -384,6 +384,7 @@ $(LEVELDB_LIB): $(LEVELDB_TIMESTAMP)
else \ else \
echo "nothing to be done for leveldb"; \ echo "nothing to be done for leveldb"; \
fi fi
endif
clean_leveldb : clean_leveldb :
$(RM) -rf deps/leveldb $(RM) -rf deps/leveldb