aboutsummaryrefslogtreecommitdiff
path: root/src/config.h
diff options
context:
space:
mode:
authorElias Fleckenstein <eliasfleckenstein@web.de>2020-07-18 13:53:15 +0200
committerElias Fleckenstein <eliasfleckenstein@web.de>2020-07-18 13:53:15 +0200
commitffe3c2ae0db6fed0f2b08b71bfa69f3d3df3bb1f (patch)
treecc7d9f74a43215c5d8e3965a2bfc2aea5867a7a0 /src/config.h
parent45aa2516b2fc675df7049bc9ed713600c95b6423 (diff)
parent82731d0d3d8bfe9e56f89466991f13c037f3a61e (diff)
downloaddragonfireclient-ffe3c2ae0db6fed0f2b08b71bfa69f3d3df3bb1f.tar.xz
Update to minetest 5.4.0-dev
Diffstat (limited to 'src/config.h')
-rw-r--r--src/config.h16
1 files changed, 3 insertions, 13 deletions
diff --git a/src/config.h b/src/config.h
index 039100914..5e1164642 100644
--- a/src/config.h
+++ b/src/config.h
@@ -11,12 +11,12 @@
#if defined USE_CMAKE_CONFIG_H
#include "cmake_config.h"
-#elif defined (__ANDROID__) || defined (ANDROID)
+#elif defined (__ANDROID__)
#define PROJECT_NAME "minetest"
#define PROJECT_NAME_C "Minetest"
#define STATIC_SHAREDIR ""
- #include "android_version.h"
- #ifdef NDEBUG
+ #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"
@@ -28,13 +28,3 @@
#define BUILD_TYPE "Debug"
#endif
#endif
-
-#define BUILD_INFO \
- "BUILD_TYPE=" BUILD_TYPE "\n" \
- "RUN_IN_PLACE=" STR(RUN_IN_PLACE) "\n" \
- "USE_GETTEXT=" STR(USE_GETTEXT) "\n" \
- "USE_SOUND=" STR(USE_SOUND) "\n" \
- "USE_CURL=" STR(USE_CURL) "\n" \
- "USE_FREETYPE=" STR(USE_FREETYPE) "\n" \
- "USE_LUAJIT=" STR(USE_LUAJIT) "\n" \
- "STATIC_SHAREDIR=" STR(STATIC_SHAREDIR);