aboutsummaryrefslogtreecommitdiff
path: root/build/android/Makefile
diff options
context:
space:
mode:
authorCraig Robbins <kde.psych@gmail.com>2015-03-28 20:25:34 +1000
committerCraig Robbins <kde.psych@gmail.com>2015-03-29 22:27:01 +1000
commit5ee0d8ac81c7d750ec01a11cf36f87c969859b7c (patch)
tree44a60c29b30bdb9fd61fdf11e7c33bd32a9e14ca /build/android/Makefile
parente1475bdc89be77ba4bf73ecf25ec1be5e0578f09 (diff)
downloadminetest-5ee0d8ac81c7d750ec01a11cf36f87c969859b7c.tar.gz
minetest-5ee0d8ac81c7d750ec01a11cf36f87c969859b7c.tar.bz2
minetest-5ee0d8ac81c7d750ec01a11cf36f87c969859b7c.zip
Fix Android build-related bugs
E.g. Sound and freetype always being disabled, redefinition of pre-processor directives
Diffstat (limited to 'build/android/Makefile')
-rw-r--r--build/android/Makefile12
1 files changed, 7 insertions, 5 deletions
diff --git a/build/android/Makefile b/build/android/Makefile
index 05997c5a2..569a45a68 100644
--- a/build/android/Makefile
+++ b/build/android/Makefile
@@ -717,11 +717,11 @@ clean_all :
clean_openal clean_ogg clean_manifest; \
sleep 1; \
$(RM) -r gen libs obj deps bin Debug and_env
-
+
$(ROOT)/jni/src/android_version.h :
- @echo "#define STR_HELPER(x) #x" \
+ @echo "#ifndef ANDROID_MT_VERSION_H" \
>${ROOT}/jni/src/android_version.h; \
- echo "#define STR(x) STR_HELPER(x)" \
+ echo "#define ANDROID_MT_VERSION_H" \
>> ${ROOT}/jni/src/android_version.h; \
echo "#define VERSION_MAJOR $$(cat ${ROOT}/../../CMakeLists.txt | \
grep ^set\(VERSION_MAJOR\ | sed 's/)/ /' | awk '{print $$2;}')" \
@@ -734,12 +734,14 @@ $(ROOT)/jni/src/android_version.h :
>> ${ROOT}/jni/src/android_version.h; \
export GITHASH=$$(git rev-parse --short=8 HEAD); \
export GITTAG=$$(git describe --abbrev=0 --tags); \
- echo "#define VERSION_GITHASH \"$$GITTAG-$$GITHASH-Android\"" \
+ echo "#define VERSION_GITHASH \"$$GITTAG-$$GITHASH-Android\"" \
>> ${ROOT}/jni/src/android_version.h; \
echo "#define VERSION_STRING STR(VERSION_MAJOR)\".\"STR(VERSION_MINOR)\
\".\"STR(VERSION_PATCH)" \
+ >> ${ROOT}/jni/src/android_version.h; \
+ echo "#endif" \
>> ${ROOT}/jni/src/android_version.h;
-
+
manifest :
@VERS_MAJOR=$$(cat ${ROOT}/../../CMakeLists.txt | \
grep ^set\(VERSION_MAJOR\ | sed 's/)/ /' | awk '{print $$2;}'); \