Oblomov
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makefile support for build without leveldb

master
sapier 2014-07-07 23:10:26 +02:00
parent fa427d641b
commit f6e01adab7
2 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build/android/Makefile
View File

@ -36,6 +36,7 @@ TARGET_TOOLCHAIN = arm-linux-androideabi-
TARGET_CFLAGS_ADDON = -mfloat-abi=softfp -mfpu=vfp TARGET_CFLAGS_ADDON = -mfloat-abi=softfp -mfpu=vfp
CROSS_PREFIX = arm-linux-androideabi- CROSS_PREFIX = arm-linux-androideabi-
COMPILER_VERSION = 4.8 COMPILER_VERSION = 4.8
HAVE_LEVELDB = 1
################################################################################ ################################################################################
# toolchain config for arm new processors # toolchain config for arm new processors
@ -50,6 +51,7 @@ COMPILER_VERSION = 4.8
#TARGET_LDFLAGS_ADDON = -Wl,--no-warn-mismatch -lm_hard #TARGET_LDFLAGS_ADDON = -Wl,--no-warn-mismatch -lm_hard
#CROSS_PREFIX = arm-linux-androideabi- #CROSS_PREFIX = arm-linux-androideabi-
#COMPILER_VERSION = 4.8 #COMPILER_VERSION = 4.8
#HAVE_LEVELDB = 1
################################################################################ ################################################################################
# toolchain config for little endian mips # toolchain config for little endian mips
@ -60,6 +62,7 @@ COMPILER_VERSION = 4.8
#TARGET_TOOLCHAIN = mipsel-linux-android- #TARGET_TOOLCHAIN = mipsel-linux-android-
#CROSS_PREFIX = mipsel-linux-android- #CROSS_PREFIX = mipsel-linux-android-
#COMPILER_VERSION = 4.8 #COMPILER_VERSION = 4.8
#HAVE_LEVELDB = 0
################################################################################ ################################################################################
# toolchain config for x86 # toolchain config for x86
@ -70,6 +73,7 @@ COMPILER_VERSION = 4.8
#TARGET_TOOLCHAIN = x86- #TARGET_TOOLCHAIN = x86-
#CROSS_PREFIX = i686-linux-android- #CROSS_PREFIX = i686-linux-android-
#COMPILER_VERSION = 4.8 #COMPILER_VERSION = 4.8
#HAVE_LEVELDB = 1
################################################################################ ################################################################################
ASSETS_TIMESTAMP = deps/assets_timestamp ASSETS_TIMESTAMP = deps/assets_timestamp
@ -136,6 +140,11 @@ FREETYPE_URL_GIT = https://github.com/cdave1/freetype2-android
$(OPENSSL_TIMESTAMP) curl_binary \ $(OPENSSL_TIMESTAMP) curl_binary \
$(ROOT)/jni/src/android_version.h $(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) debug : $(PATHCFGFILE)
export NDEBUG=; \ export NDEBUG=; \
export BUILD_TYPE=debug; \ export BUILD_TYPE=debug; \
@ -628,14 +637,14 @@ assets : $(ASSETS_TIMESTAMP)
clean_assets : clean_assets :
@$(RM) -r 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 $(OPENAL_LIB) $(OGG_LIB) prep_srcdir $(ROOT)/jni/src/android_version.h
@export NDEBUG=$$NDEBUG; $(MAKE) -j${PARALLEL} manifest; \ @export NDEBUG=$$NDEBUG; $(MAKE) -j${PARALLEL} manifest; \
export PATH=$$PATH:${SDKFOLDER}/platform-tools:${ANDROID_NDK}; \ export PATH=$$PATH:${SDKFOLDER}/platform-tools:${ANDROID_NDK}; \
export ANDROID_HOME=${SDKFOLDER}; \ export ANDROID_HOME=${SDKFOLDER}; \
mkdir -p ${ROOT}/src; \ mkdir -p ${ROOT}/src; \
ndk-build NDK_MODULE_PATH=${NDK_MODULE_PATH} -j${PARALLEL} \ 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} \ APP_PLATFORM=${APP_PLATFORM} \
TARGET_LIBDIR=${TARGET_LIBDIR} \ TARGET_LIBDIR=${TARGET_LIBDIR} \
TARGET_CFLAGS+="${TARGET_CFLAGS_ADDON}" \ TARGET_CFLAGS+="${TARGET_CFLAGS_ADDON}" \

30
build/android/jni/Android.mk
View File

@ -7,10 +7,12 @@ LOCAL_MODULE := Irrlicht
LOCAL_SRC_FILES := deps/irrlicht/lib/Android/libIrrlicht.a LOCAL_SRC_FILES := deps/irrlicht/lib/Android/libIrrlicht.a
include $(PREBUILT_STATIC_LIBRARY) include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS) ifeq ($(HAVE_LEVELDB), 1)
LOCAL_MODULE := LevelDB include $(CLEAR_VARS)
LOCAL_SRC_FILES := deps/leveldb/libleveldb.a LOCAL_MODULE := LevelDB
include $(PREBUILT_STATIC_LIBRARY) LOCAL_SRC_FILES := deps/leveldb/libleveldb.a
include $(PREBUILT_STATIC_LIBRARY)
endif
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := curl LOCAL_MODULE := curl
@ -57,13 +59,13 @@ ifdef GPROF
GPROF_DEF=-DGPROF GPROF_DEF=-DGPROF
endif endif
LOCAL_CFLAGS := -D_IRR_ANDROID_PLATFORM_ \ LOCAL_CFLAGS := -D_IRR_ANDROID_PLATFORM_ \
-DHAVE_TOUCHSCREENGUI \ -DHAVE_TOUCHSCREENGUI \
-DUSE_CURL=1 \ -DUSE_CURL=1 \
-DUSE_SOUND=1 \ -DUSE_SOUND=1 \
-DUSE_FREETYPE=1 \ -DUSE_FREETYPE=1 \
-DUSE_LEVELDB=1 \ -DUSE_LEVELDB=$(HAVE_LEVELDB) \
$(GPROF_DEF) \ $(GPROF_DEF) \
-pipe -fstrict-aliasing -pipe -fstrict-aliasing
ifndef NDEBUG ifndef NDEBUG
@ -294,7 +296,11 @@ LOCAL_SRC_FILES += \
LOCAL_SRC_FILES += jni/src/json/jsoncpp.cpp LOCAL_SRC_FILES += jni/src/json/jsoncpp.cpp
LOCAL_SHARED_LIBRARIES := openal ogg vorbis ssl crypto LOCAL_SHARED_LIBRARIES := openal ogg vorbis ssl crypto
LOCAL_STATIC_LIBRARIES := Irrlicht freetype curl LevelDB android_native_app_glue $(PROFILER_LIBS) LOCAL_STATIC_LIBRARIES := Irrlicht freetype curl android_native_app_glue $(PROFILER_LIBS)
ifeq ($(HAVE_LEVELDB), 1)
LOCAL_STATIC_LIBRARIES += LevelDB
endif
LOCAL_LDLIBS := -lEGL -llog -lGLESv1_CM -lGLESv2 -lz -landroid LOCAL_LDLIBS := -lEGL -llog -lGLESv1_CM -lGLESv2 -lz -landroid
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)