aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryou <ovvv@web.de>2017-09-03 22:32:30 +0200
committerLoïc Blot <nerzhul@users.noreply.github.com>2017-09-03 22:32:30 +0200
commitad9786c44b7d09b2d7972884ef5e6791861dd151 (patch)
tree4d48949cda5f20a41a6085ac6c73922186f6cdfd
parent9f6d90aa811dd8f523b137d602127d31307ea15c (diff)
downloadminetest-ad9786c44b7d09b2d7972884ef5e6791861dd151.tar.gz
minetest-ad9786c44b7d09b2d7972884ef5e6791861dd151.tar.bz2
minetest-ad9786c44b7d09b2d7972884ef5e6791861dd151.zip
Add build date to minetest --version and increase readability (#6331)
-rw-r--r--src/config.h13
-rw-r--r--src/main.cpp6
-rw-r--r--src/version.cpp16
3 files changed, 17 insertions, 18 deletions
diff --git a/src/config.h b/src/config.h
index fc4be6e9e..5882b4e21 100644
--- a/src/config.h
+++ b/src/config.h
@@ -5,10 +5,6 @@
#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)
@@ -28,12 +24,3 @@
#define BUILD_TYPE "Debug"
#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)
diff --git a/src/main.cpp b/src/main.cpp
index 3099c9789..e2f2b22cf 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -322,11 +322,11 @@ static void print_allowed_options(const OptionList &allowed_options)
static void print_version()
{
std::cout << PROJECT_NAME_C " " << g_version_hash
- << " (" << porting::getPlatformName() << ")" << std::endl;
+ << " (" << porting::getPlatformName() << ")" << std::endl;
#ifndef SERVER
- std::cout << "Using Irrlicht " << IRRLICHT_SDK_VERSION << std::endl;
+ std::cout << "Using Irrlicht " IRRLICHT_SDK_VERSION << std::endl;
#endif
- std::cout << "Build info: " << g_build_info << std::endl;
+ std::cout << g_build_info << std::endl;
}
static void list_game_ids()
diff --git a/src/version.cpp b/src/version.cpp
index ca206bded..9887efdb1 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -31,8 +31,20 @@ 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 = "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);