BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Update version correctly again (#6462)

Browse Source 
* Update version correctly again
Partial revert of PR 6331

* It doesn't update automatically
This commit is contained in:
SmallJoker 2017-09-26 20:30:42 +02:00 committed by Loïc Blot
parent 50423d8c72
commit 50b2185ced
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/config.h
View File

@ -5,6 +5,10 @@
#pragma once #pragma once
#define STRINGIFY(x) #x
#define STR(x) STRINGIFY(x)
#if defined USE_CMAKE_CONFIG_H #if defined USE_CMAKE_CONFIG_H
#include "cmake_config.h" #include "cmake_config.h"
#elif defined (__ANDROID__) || defined (ANDROID) #elif defined (__ANDROID__) || defined (ANDROID)
@ -24,3 +28,13 @@
#define BUILD_TYPE "Debug" #define BUILD_TYPE "Debug"
#endif #endif
#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);

16
src/version.cpp
View File

@ -31,20 +31,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define VERSION_GITHASH VERSION_STRING #define VERSION_GITHASH VERSION_STRING
#endif #endif
#define STRINGIFY(x) #x
#define STR(x) STRINGIFY(x)
const char *g_version_string = VERSION_STRING; const char *g_version_string = VERSION_STRING;
const char *g_version_hash = VERSION_GITHASH; const char *g_version_hash = VERSION_GITHASH;
const char *g_build_info = const char *g_build_info = 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);