diff options
| author | Craig Robbins <kde.psych@gmail.com> | 2015-03-28 20:25:34 +1000 |
|---|---|---|
| committer | Craig Robbins <kde.psych@gmail.com> | 2015-03-29 22:27:01 +1000 |
| commit | 5ee0d8ac81c7d750ec01a11cf36f87c969859b7c (patch) | |
| tree | 44a60c29b30bdb9fd61fdf11e7c33bd32a9e14ca /src | |
| parent | e1475bdc89be77ba4bf73ecf25ec1be5e0578f09 (diff) | |
| download | minetest-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 'src')
| -rw-r--r-- | src/config.h | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/src/config.h b/src/config.h index ac7684e20..df7429be0 100644 --- a/src/config.h +++ b/src/config.h @@ -10,29 +10,23 @@ #define STR(x) STRINGIFY(x) -#ifdef USE_CMAKE_CONFIG_H +#if defined USE_CMAKE_CONFIG_H #include "cmake_config.h" -#else +#elif defined (__ANDROID__) || defined (ANDROID) #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 "" + #include "android_version.h" + #ifdef NDEBUG + #define BUILD_TYPE "Release" + #else + #define BUILD_TYPE "Debug" + #endif +#else #ifdef NDEBUG #define BUILD_TYPE "Release" #else #define BUILD_TYPE "Debug" #endif -#endif - -#ifdef __ANDROID__ - #include "android_version.h" #endif #define BUILD_INFO "BUILD_TYPE=" BUILD_TYPE \ @@ -45,4 +39,3 @@ " STATIC_SHAREDIR=" STR(STATIC_SHAREDIR) #endif - |