Skip to content

Commit

Permalink
Switch android build to external sqlite3
Browse files Browse the repository at this point in the history
  • Loading branch information
sapier authored and sapier committed Jan 7, 2015
1 parent 42f3515 commit 2b8ed9e
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 3 deletions.
20 changes: 18 additions & 2 deletions build/android/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 \
Expand Down Expand Up @@ -553,6 +556,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" "); \
Expand Down Expand Up @@ -661,7 +676,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}; \
Expand Down
3 changes: 2 additions & 1 deletion build/android/jni/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ LOCAL_C_INCLUDES := \
deps/openal-soft/jni/OpenAL/include \
deps/libvorbis-libogg-android/jni/include \
deps/leveldb/include \
deps/sqlite/

LOCAL_SRC_FILES := \
jni/src/ban.cpp \
Expand Down Expand Up @@ -290,7 +291,7 @@ LOCAL_SRC_FILES += \
jni/src/lua/src/print.c

# sqlite
LOCAL_SRC_FILES += jni/src/sqlite/sqlite3.c
LOCAL_SRC_FILES += deps/sqlite/sqlite3.c

# jthread
LOCAL_SRC_FILES += \
Expand Down

0 comments on commit 2b8ed9e

Please sign in to comment.