daufinsyd
/
spheretest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android Makefile update backported from stable-0.4 with minor changes

master
Loic Blot 2015-03-15 11:21:34 +01:00
parent 89217faec5
commit 2bc0165652
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build/android/Makefile
View File

@ -26,7 +26,8 @@ GAMES_TO_COPY = minetest_game
# Android Version code # Android Version code
# Increase for each build! # Increase for each build!
################################################################################ ################################################################################
ANDROID_VERSION_CODE = 10 # Play Store actual version (15/03/15): 10
ANDROID_VERSION_CODE = 11
################################################################################ ################################################################################
# toolchain config for arm old processors # toolchain config for arm old processors
@ -742,10 +743,8 @@ $(ROOT)/jni/src/android_version.h :
grep ^set\(VERSION_PATCH\ | sed 's/)/ /' | awk '{print $$2;}')" \ grep ^set\(VERSION_PATCH\ | sed 's/)/ /' | awk '{print $$2;}')" \
>> ${ROOT}/jni/src/android_version.h; \ >> ${ROOT}/jni/src/android_version.h; \
export GITHASH=$$(git rev-parse --short=8 HEAD); \ export GITHASH=$$(git rev-parse --short=8 HEAD); \
if [ "x$$GITHASH" = "x" ] ; then \ export GITTAG=$$(git describe --abbrev=0 --tags); \
export GITHASH=gUnknown; \ echo "#define CMAKE_VERSION_GITHASH \"$$GITTAG-$$GITHASH-Android\"" \
fi; \
echo "#define CMAKE_VERSION_GITHASH \"$$GITHASH\"" \
>> ${ROOT}/jni/src/android_version.h; \ >> ${ROOT}/jni/src/android_version.h; \
echo "#define CMAKE_VERSION_STRING STR(VERSION_MAJOR)\".\"STR(VERSION_MINOR)\ echo "#define CMAKE_VERSION_STRING STR(VERSION_MAJOR)\".\"STR(VERSION_MINOR)\
\".\"STR(VERSION_PATCH)" \ \".\"STR(VERSION_PATCH)" \