Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-27 10:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve --version output to include Lua(JIT) version

Browse Source
This commit is contained in:
sfan5 2021-01-20 15:01:48 +01:00
parent 7f25823bd4
commit d92da47697
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main.cpp
View File

@ -47,11 +47,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "gui/guiEngine.h" #include "gui/guiEngine.h"
#include "gui/mainmenumanager.h" #include "gui/mainmenumanager.h"
#endif #endif
#ifdef HAVE_TOUCHSCREENGUI #ifdef HAVE_TOUCHSCREENGUI
#include "gui/touchscreengui.h" #include "gui/touchscreengui.h"
#endif #endif
// for version information only
extern "C" {
#if USE_LUAJIT
#include <luajit.h>
#else
#include <lua.h>
#endif
}
#if !defined(SERVER) && \ #if !defined(SERVER) && \
(IRRLICHT_VERSION_MAJOR == 1) && \ (IRRLICHT_VERSION_MAJOR == 1) && \
(IRRLICHT_VERSION_MINOR == 8) && \ (IRRLICHT_VERSION_MINOR == 8) && \
@ -350,6 +358,11 @@ static void print_version()
<< " (" << 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
#if USE_LUAJIT
std::cout << "Using " << LUAJIT_VERSION << std::endl;
#else
std::cout << "Using " << LUA_RELEASE << std::endl;
#endif #endif
std::cout << g_build_info << std::endl; std::cout << g_build_info << std::endl;
} }

5
src/version.cpp
View File

@ -33,11 +33,12 @@ const char *g_version_hash = VERSION_GITHASH;
const char *g_build_info = const char *g_build_info =
"BUILD_TYPE=" BUILD_TYPE "\n" "BUILD_TYPE=" BUILD_TYPE "\n"
"RUN_IN_PLACE=" STR(RUN_IN_PLACE) "\n" "RUN_IN_PLACE=" STR(RUN_IN_PLACE) "\n"
"USE_CURL=" STR(USE_CURL) "\n"
#ifndef SERVER
"USE_GETTEXT=" STR(USE_GETTEXT) "\n" "USE_GETTEXT=" STR(USE_GETTEXT) "\n"
"USE_SOUND=" STR(USE_SOUND) "\n" "USE_SOUND=" STR(USE_SOUND) "\n"
"USE_CURL=" STR(USE_CURL) "\n"
"USE_FREETYPE=" STR(USE_FREETYPE) "\n" "USE_FREETYPE=" STR(USE_FREETYPE) "\n"
"USE_LUAJIT=" STR(USE_LUAJIT) "\n" #endif
"STATIC_SHAREDIR=" STR(STATIC_SHAREDIR) "STATIC_SHAREDIR=" STR(STATIC_SHAREDIR)
#if USE_GETTEXT && defined(STATIC_LOCALEDIR) #if USE_GETTEXT && defined(STATIC_LOCALEDIR)
"\n" "STATIC_LOCALEDIR=" STR(STATIC_LOCALEDIR) "\n" "STATIC_LOCALEDIR=" STR(STATIC_LOCALEDIR)