diff options
| author | Elias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com> | 2020-11-04 16:44:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 16:44:42 +0100 |
| commit | 5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (patch) | |
| tree | c980d614fec4a5495798be3e79e033229062c3cd /src/config.h | |
| parent | 28f6a79706b088c37268a59d90878220dc4ef9c7 (diff) | |
| parent | 3af10766fd2b58b068e970266724d7eb10e9316b (diff) | |
| download | dragonfireclient-5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc.tar.xz | |
Merge branch 'master' into master
Diffstat (limited to 'src/config.h')
| -rw-r--r-- | src/config.h | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/src/config.h b/src/config.h index 5e1164642..d4bde7896 100644 --- a/src/config.h +++ b/src/config.h @@ -8,23 +8,24 @@ #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) +#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 #ifdef NDEBUG - #define BUILD_TYPE "Release" - #else - #define BUILD_TYPE "Debug" - #endif +#define BUILD_TYPE "Release" #else - #ifdef NDEBUG - #define BUILD_TYPE "Release" - #else - #define BUILD_TYPE "Debug" - #endif +#define BUILD_TYPE "Debug" +#endif #endif |