diff options
| author | SmallJoker <SmallJoker@users.noreply.github.com> | 2017-09-26 20:30:42 +0200 |
|---|---|---|
| committer | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-09-26 20:30:42 +0200 |
| commit | 50b2185ced9dc64e054ce743bbc22d15ecdf6192 (patch) | |
| tree | e470f62c6ca200536e9beed08690253c00308905 | |
| parent | 50423d8c729ee133035e3bb1e244bfbd1bdc0ef0 (diff) | |
| download | minetest-50b2185ced9dc64e054ce743bbc22d15ecdf6192.tar.gz minetest-50b2185ced9dc64e054ce743bbc22d15ecdf6192.tar.bz2 minetest-50b2185ced9dc64e054ce743bbc22d15ecdf6192.zip | |
Update version correctly again (#6462)
* Update version correctly again
Partial revert of PR 6331
* It doesn't update automatically
| -rw-r--r-- | src/config.h | 14 | ||||
| -rw-r--r-- | src/version.cpp | 16 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/config.h b/src/config.h index 5882b4e21..039100914 100644 --- a/src/config.h +++ b/src/config.h @@ -5,6 +5,10 @@ #pragma once +#define STRINGIFY(x) #x +#define STR(x) STRINGIFY(x) + + #if defined USE_CMAKE_CONFIG_H #include "cmake_config.h" #elif defined (__ANDROID__) || defined (ANDROID) @@ -24,3 +28,13 @@ #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); diff --git a/src/version.cpp b/src/version.cpp index 9887efdb1..c0c59ee99 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -31,20 +31,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #define VERSION_GITHASH VERSION_STRING #endif -#define STRINGIFY(x) #x -#define STR(x) STRINGIFY(x) - const char *g_version_string = VERSION_STRING; const char *g_version_hash = VERSION_GITHASH; -const char *g_build_info = -#ifdef __STDC__ - "Build date: " __DATE__ " " __TIME__ "\n" -#endif - "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); +const char *g_build_info = BUILD_INFO; |