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

minetest · Jan 20, 2021 · d92da47 · d92da47
1 parent 7f25823
commit d92da47
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -47,11 +47,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "gui/guiEngine.h"
 #include "gui/mainmenumanager.h"
 #endif
-
 #ifdef HAVE_TOUCHSCREENGUI
 	#include "gui/touchscreengui.h"
 #endif
 
+// for version information only
+extern "C" {
+#if USE_LUAJIT
+	#include <luajit.h>
+#else
+	#include <lua.h>
+#endif
+}
+
 #if !defined(SERVER) && \
 	(IRRLICHT_VERSION_MAJOR == 1) && \
 	(IRRLICHT_VERSION_MINOR == 8) && \
@@ -350,6 +358,11 @@ static void print_version()
 		<< " (" << porting::getPlatformName() << ")" << std::endl;
 #ifndef SERVER
 	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
 	std::cout << g_build_info << std::endl;
 }

diff --git a/src/version.cpp b/src/version.cpp
@@ -33,11 +33,12 @@ const char *g_version_hash = VERSION_GITHASH;
 const char *g_build_info =
 	"BUILD_TYPE=" BUILD_TYPE "\n"
 	"RUN_IN_PLACE=" STR(RUN_IN_PLACE) "\n"
+	"USE_CURL=" STR(USE_CURL) "\n"
+#ifndef SERVER
 	"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"
+#endif
 	"STATIC_SHAREDIR=" STR(STATIC_SHAREDIR)
 #if USE_GETTEXT && defined(STATIC_LOCALEDIR)
 	"\n" "STATIC_LOCALEDIR=" STR(STATIC_LOCALEDIR)