minenux
/
minetest-engine-minecheat
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

Fix Android build-related bugs 

E.g. Sound and freetype always being disabled, redefinition of pre-processor directives
stable-0.4
Craig Robbins 2015-03-28 20:25:34 +10:00
parent e1475bdc89
commit 5ee0d8ac81
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/android/Makefile
View File

@ -717,11 +717,11 @@ clean_all :
clean_openal clean_ogg clean_manifest; \ clean_openal clean_ogg clean_manifest; \
sleep 1; \ sleep 1; \
$(RM) -r gen libs obj deps bin Debug and_env $(RM) -r gen libs obj deps bin Debug and_env
$(ROOT)/jni/src/android_version.h : $(ROOT)/jni/src/android_version.h :
@echo "#define STR_HELPER(x) #x" \ @echo "#ifndef ANDROID_MT_VERSION_H" \
>${ROOT}/jni/src/android_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; \ >> ${ROOT}/jni/src/android_version.h; \
echo "#define VERSION_MAJOR $$(cat ${ROOT}/../../CMakeLists.txt | \ echo "#define VERSION_MAJOR $$(cat ${ROOT}/../../CMakeLists.txt | \
grep ^set\(VERSION_MAJOR\ | sed 's/)/ /' | awk '{print $$2;}')" \ 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; \ >> ${ROOT}/jni/src/android_version.h; \
export GITHASH=$$(git rev-parse --short=8 HEAD); \ export GITHASH=$$(git rev-parse --short=8 HEAD); \
export GITTAG=$$(git describe --abbrev=0 --tags); \ 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; \ >> ${ROOT}/jni/src/android_version.h; \
echo "#define VERSION_STRING STR(VERSION_MAJOR)\".\"STR(VERSION_MINOR)\ echo "#define VERSION_STRING STR(VERSION_MAJOR)\".\"STR(VERSION_MINOR)\
\".\"STR(VERSION_PATCH)" \ \".\"STR(VERSION_PATCH)" \
>> ${ROOT}/jni/src/android_version.h; \
echo "#endif" \
>> ${ROOT}/jni/src/android_version.h; >> ${ROOT}/jni/src/android_version.h;
manifest : manifest :
@VERS_MAJOR=$$(cat ${ROOT}/../../CMakeLists.txt | \ @VERS_MAJOR=$$(cat ${ROOT}/../../CMakeLists.txt | \
grep ^set\(VERSION_MAJOR\ | sed 's/)/ /' | awk '{print $$2;}'); \ grep ^set\(VERSION_MAJOR\ | sed 's/)/ /' | awk '{print $$2;}'); \

25
src/config.h
View File

@ -10,29 +10,23 @@
#define STR(x) STRINGIFY(x) #define STR(x) STRINGIFY(x)
#ifdef USE_CMAKE_CONFIG_H #if defined USE_CMAKE_CONFIG_H
#include "cmake_config.h" #include "cmake_config.h"
#else #elif defined (__ANDROID__) || defined (ANDROID)
#define PROJECT_NAME "Minetest" #define PROJECT_NAME "Minetest"
#define RUN_IN_PLACE 0
#define USE_CURL 0
#define USE_FREETYPE 0
#define USE_GETTEXT 0
#define USE_LEVELDB 0
#define USE_LUAJIT 0
#define USE_REDIS 0
#define USE_SOUND 0
#define HAVE_ENDIAN_H 0
#define STATIC_SHAREDIR "" #define STATIC_SHAREDIR ""
#include "android_version.h"
#ifdef NDEBUG
#define BUILD_TYPE "Release"
#else
#define BUILD_TYPE "Debug"
#endif
#else
#ifdef NDEBUG #ifdef NDEBUG
#define BUILD_TYPE "Release" #define BUILD_TYPE "Release"
#else #else
#define BUILD_TYPE "Debug" #define BUILD_TYPE "Debug"
#endif #endif
#endif
#ifdef __ANDROID__
#include "android_version.h"
#endif #endif
#define BUILD_INFO "BUILD_TYPE=" BUILD_TYPE \ #define BUILD_INFO "BUILD_TYPE=" BUILD_TYPE \
@ -45,4 +39,3 @@
" STATIC_SHAREDIR=" STR(STATIC_SHAREDIR) " STATIC_SHAREDIR=" STR(STATIC_SHAREDIR)
#endif #endif