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

Add build date to minetest --version and increase readability (#6331)

Browse Source
This commit is contained in:
you 2017-09-03 22:32:30 +02:00 committed by Loïc Blot
parent 9f6d90aa81
commit ad9786c44b
3 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/config.h
View File

@ -5,10 +5,6 @@
#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)
@ -28,12 +24,3 @@
#define BUILD_TYPE "Debug" #define BUILD_TYPE "Debug"
#endif #endif
#endif #endif
#define BUILD_INFO "BUILD_TYPE=" BUILD_TYPE \
" RUN_IN_PLACE=" STR(RUN_IN_PLACE) \
" USE_GETTEXT=" STR(USE_GETTEXT) \
" USE_SOUND=" STR(USE_SOUND) \
" USE_CURL=" STR(USE_CURL) \
" USE_FREETYPE=" STR(USE_FREETYPE) \
" USE_LUAJIT=" STR(USE_LUAJIT) \
" STATIC_SHAREDIR=" STR(STATIC_SHAREDIR)

6
src/main.cpp
View File

@ -322,11 +322,11 @@ static void print_allowed_options(const OptionList &allowed_options)
static void print_version() static void print_version()
{ {
std::cout << PROJECT_NAME_C " " << g_version_hash std::cout << PROJECT_NAME_C " " << g_version_hash
<< " (" << porting::getPlatformName() << ")" << std::endl; << " (" << porting::getPlatformName() << ")" << std::endl;
#ifndef SERVER #ifndef SERVER
std::cout << "Using Irrlicht " << IRRLICHT_SDK_VERSION << std::endl; std::cout << "Using Irrlicht " IRRLICHT_SDK_VERSION << std::endl;
#endif #endif
std::cout << "Build info: " << g_build_info << std::endl; std::cout << g_build_info << std::endl;
} }
static void list_game_ids() static void list_game_ids()

16
src/version.cpp
View File

@ -31,8 +31,20 @@ 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 = "VER=" VERSION_GITHASH " " BUILD_INFO; 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);