MultiCraftProject/MultiCraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CRLF fix

Browse Source
This commit is contained in:
Maksim Gamarnik 2016-04-29 11:11:26 +03:00
parent d5854e5cf7
commit 798495681c
4 changed files with 312 additions and 322 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
build/android/Makefile
View File

@ -1,5 +1,7 @@
################################################################################ ################################################################################
OS := $(shell uname)
# compile with GPROF # compile with GPROF
# GPROF = 1 # GPROF = 1
@ -139,17 +141,6 @@ LUAJIT_URL_GIT = https://github.com/LuaJIT/LuaJIT.git
################################################################################ ################################################################################
OS := $(shell uname)
ANDR_ROOT = $(shell pwd)
VERSION_MAJOR := $(shell cat $(ANDR_ROOT)/../../CMakeLists.txt | \
grep ^set\(VERSION_MAJOR\ | sed 's/)/ /' | cut -f2 -d' ')
VERSION_MINOR := $(shell cat $(ANDR_ROOT)/../../CMakeLists.txt | \
grep ^set\(VERSION_MINOR\ | sed 's/)/ /' | cut -f2 -d' ')
VERSION_PATCH := $(shell cat $(ANDR_ROOT)/../../CMakeLists.txt | \
grep ^set\(VERSION_PATCH\ | sed 's/)/ /' | cut -f2 -d' ')
ANDROID_SDK = $(shell grep '^sdk\.dir' local.properties | sed 's/^.*=[[:space:]]*//') ANDROID_SDK = $(shell grep '^sdk\.dir' local.properties | sed 's/^.*=[[:space:]]*//')
ANDROID_NDK = $(shell grep '^ndk\.dir' local.properties | sed 's/^.*=[[:space:]]*//') ANDROID_NDK = $(shell grep '^ndk\.dir' local.properties | sed 's/^.*=[[:space:]]*//')
NDK_MODULE_PATH = $(ANDROID_NDK)/toolchains NDK_MODULE_PATH = $(ANDROID_NDK)/toolchains
@ -166,8 +157,7 @@ NDK_MODULE_PATH = $(ANDROID_NDK)/toolchains
$(ASSETS_TIMESTAMP) $(LUAJIT_TIMESTAMP) \ $(ASSETS_TIMESTAMP) $(LUAJIT_TIMESTAMP) \
$(OPENAL_TIMESTAMP) $(VORBIS_TIMESTAMP) \ $(OPENAL_TIMESTAMP) $(VORBIS_TIMESTAMP) \
$(IRRLICHT_TIMESTAMP) $(CURL_TIMESTAMP) \ $(IRRLICHT_TIMESTAMP) $(CURL_TIMESTAMP) \
#$(OPENSSL_TIMESTAMP) $(VORBIS_TIMESTAMP) \ #$(OPENSSL_TIMESTAMP) \
$(VORBIS_TIMESTAMP) \
$(ANDR_ROOT)/jni/src/android_version.h \ $(ANDR_ROOT)/jni/src/android_version.h \
$(ANDR_ROOT)/jni/src/android_version_githash.h $(ANDR_ROOT)/jni/src/android_version_githash.h
@ -348,7 +338,7 @@ $(FREETYPE_TIMESTAMP) : freetype_download
fi fi
freetype_download : freetype_download :
@if [ ! -d "${FREETYPE_DIR}" ] ; then \ @if [ ! -d ${FREETYPE_DIR} ] ; then \
echo "freetype sources missing, downloading..."; \ echo "freetype sources missing, downloading..."; \
mkdir -p ${ANDR_ROOT}/deps; \ mkdir -p ${ANDR_ROOT}/deps; \
cd deps; \ cd deps; \
@ -372,6 +362,7 @@ $(FREETYPE_LIB) : $(FREETYPE_TIMESTAMP)
REFRESH=1; \ REFRESH=1; \
fi; \ fi; \
if [ $$REFRESH -ne 0 ] ; then \ if [ $$REFRESH -ne 0 ] ; then \
mkdir -p ${FREETYPE_DIR}; \
export PATH=$$PATH:${ANDROID_NDK}; \ export PATH=$$PATH:${ANDROID_NDK}; \
echo "changed timestamp for freetype detected building..."; \ echo "changed timestamp for freetype detected building..."; \
cd deps/freetype; \ cd deps/freetype; \
@ -436,6 +427,7 @@ $(ICONV_LIB) : $(ICONV_TIMESTAMP)
mkdir -p ${ICONV_DIR}; \ mkdir -p ${ICONV_DIR}; \
echo "changed timestamp for iconv detected building..."; \ echo "changed timestamp for iconv detected building..."; \
cd ${ICONV_DIR}; \ cd ${ICONV_DIR}; \
\
export TOOLCHAIN=/tmp/ndk-${TARGET_HOST}-iconv; \ export TOOLCHAIN=/tmp/ndk-${TARGET_HOST}-iconv; \
${ANDROID_NDK}/build/tools/make-standalone-toolchain.sh \ ${ANDROID_NDK}/build/tools/make-standalone-toolchain.sh \
--toolchain=${TARGET_TOOLCHAIN}-${COMPILER_VERSION} \ --toolchain=${TARGET_TOOLCHAIN}-${COMPILER_VERSION} \
@ -524,7 +516,6 @@ $(CURL_TIMESTAMP) : curl_download
touch ${CURL_TIMESTAMP}; \ touch ${CURL_TIMESTAMP}; \
fi fi
curl_download : curl_download :
@if [ ! -d "deps/curl" ] ; then \ @if [ ! -d "deps/curl" ] ; then \
echo "curl sources missing, downloading..."; \ echo "curl sources missing, downloading..."; \
@ -540,7 +531,7 @@ curl : $(CURL_LIB)
#$(CURL_LIB): $(CURL_TIMESTAMP) $(OPENSSL_LIB) #$(CURL_LIB): $(CURL_TIMESTAMP) $(OPENSSL_LIB)
$(CURL_LIB): $(CURL_TIMESTAMP) $(CURL_LIB): $(CURL_TIMESTAMP)
+ @REFRESH=0; \ @REFRESH=0; \
if [ ! -e ${CURL_TIMESTAMP_INT} ] ; then \ if [ ! -e ${CURL_TIMESTAMP_INT} ] ; then \
REFRESH=1; \ REFRESH=1; \
fi; \ fi; \
@ -758,8 +749,7 @@ assets : $(ASSETS_TIMESTAMP)
clean_assets : clean_assets :
@$(RM) -r assets @$(RM) -r assets
apk: $(PATHCFGFILE) assets $(ICONV_LIB) $(IRRLICHT_LIB) $(CURL_LIB) $(GMP_LIB) \ apk: local.properties assets $(ICONV_LIB) $(IRRLICHT_LIB) $(CURL_LIB) $(GMP_LIB) $(LUAJIT_LIB) \ \
$(LUAJIT_LIB) \
$(OPENAL_LIB) $(VORBIS_LIB) prep_srcdir $(ANDR_ROOT)/jni/src/android_version.h \ $(OPENAL_LIB) $(VORBIS_LIB) prep_srcdir $(ANDR_ROOT)/jni/src/android_version.h \
$(ANDR_ROOT)/jni/src/android_version_githash.h sqlite3_download $(ANDR_ROOT)/jni/src/android_version_githash.h sqlite3_download
@${ANDROID_NDK}/ndk-build NDK_MODULE_PATH=${NDK_MODULE_PATH} \ @${ANDROID_NDK}/ndk-build NDK_MODULE_PATH=${NDK_MODULE_PATH} \