Skip to content
Permalink
Browse files

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

  • Loading branch information
HybridDog authored and nerzhul committed Sep 3, 2017
1 parent 9f6d90a commit ad9786c44b7d09b2d7972884ef5e6791861dd151
Showing with 17 additions and 18 deletions.
  1. +0 −13 src/config.h
  2. +3 −3 src/main.cpp
  3. +14 −2 src/version.cpp
@@ -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)
@@ -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()
@@ -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);

0 comments on commit ad9786c

Please sign in to comment.