diff options
| author | Elias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com> | 2020-11-04 16:57:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 16:57:47 +0100 |
| commit | 3e16c3a78fff61c20e63ba730d15e94e3bb877b4 (patch) | |
| tree | c070350db219f2c4241d22bc31949685c7b42fe9 /src/config.h | |
| parent | 5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (diff) | |
| parent | 6ccb5835ff55d85156be91473c598eca9d6cb9a6 (diff) | |
| download | dragonfireclient-3e16c3a78fff61c20e63ba730d15e94e3bb877b4.tar.xz | |
Merge branch 'master' into master
Diffstat (limited to 'src/config.h')
| -rw-r--r-- | src/config.h | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/src/config.h b/src/config.h index d4bde7896..5e1164642 100644 --- a/src/config.h +++ b/src/config.h @@ -8,24 +8,23 @@ #define STRINGIFY(x) #x #define STR(x) STRINGIFY(x) + #if defined USE_CMAKE_CONFIG_H -#include "cmake_config.h" -#elif defined(__ANDROID__) -#define PROJECT_NAME "minetest" -#define PROJECT_NAME_C "Minetest" -#define STATIC_SHAREDIR "" -#define VERSION_STRING \ - STR(VERSION_MAJOR) \ - "." STR(VERSION_MINOR) "." STR(VERSION_PATCH) STR(VERSION_EXTRA) -#ifdef NDEBUG -#define BUILD_TYPE "Release" -#else -#define BUILD_TYPE "Debug" -#endif -#else + #include "cmake_config.h" +#elif defined (__ANDROID__) + #define PROJECT_NAME "minetest" + #define PROJECT_NAME_C "Minetest" + #define STATIC_SHAREDIR "" + #define VERSION_STRING STR(VERSION_MAJOR) "." STR(VERSION_MINOR) "." STR(VERSION_PATCH) STR(VERSION_EXTRA) #ifdef NDEBUG -#define BUILD_TYPE "Release" + #define BUILD_TYPE "Release" + #else + #define BUILD_TYPE "Debug" + #endif #else -#define BUILD_TYPE "Debug" -#endif + #ifdef NDEBUG + #define BUILD_TYPE "Release" + #else + #define BUILD_TYPE "Debug" + #endif #endif |