luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-31 15:35:21 +01:00
Code Activity

Android: update makefile and backport language fix from master

Browse Source
This commit is contained in:
Loic Blot
2015-03-15 11:01:15 +01:00
parent a740a48f62
commit 0429ec4cfd
5 changed files with 89 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
build/android/Makefile
View File

@@ -26,7 +26,8 @@ GAMES_TO_COPY = minetest_game
# Android Version code
# 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
@@ -743,9 +744,13 @@ $(ROOT)/jni/src/android_version.h :
>> ${ROOT}/jni/src/android_version.h; \
export GITHASH=$$(git rev-parse --short=8 HEAD); \
if [ "x$$GITHASH" = "x" ] ; then \
export GITHASH=gUnknown; \
export GITHASH=""; \
fi; \
echo "#define CMAKE_VERSION_GITHASH \"$$GITHASH\"" \
export GITTAG=$$(git describe --abbrev=0 --tags); \
if [ "x$$GITTAG" = "x" ] ; then \
export GITTAG=""; \
fi; \
echo "#define CMAKE_VERSION_GITHASH \"$$GITTAG-$$GITHASH-Android\"" \
>> ${ROOT}/jni/src/android_version.h; \
echo "#define CMAKE_VERSION_STRING STR(VERSION_MAJOR)\".\"STR(VERSION_MINOR)\
\".\"STR(VERSION_PATCH)" \