Object properties: Fix loss of custom selectionbox

[oweals/minetest.git] / src / version.cpp

diff --git a/src/version.cpp b/src/version.cpp
index ecfeb95f8613bb1e4f32b7f879d1ed6c84819094..9887efdb11c903484aac9e27b6e9d30e7587f6eb 100644 (file)
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -20,27 +20,31 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "version.h"
 #include "config.h"
 
-#ifdef __ANDROID__
+#if defined(__ANDROID__)
        #include "android_version.h"
+       #include "android_version_githash.h"
 #elif defined(USE_CMAKE_CONFIG_H)
        #include "cmake_config_githash.h"
 #endif
 
-#ifdef CMAKE_VERSION_GITHASH
-       #define VERSION_GITHASH CMAKE_VERSION_GITHASH
-#else
+#ifndef VERSION_GITHASH
        #define VERSION_GITHASH VERSION_STRING
 #endif
 
-const char *minetest_version_simple = VERSION_STRING;
-const char *minetest_version_hash = VERSION_GITHASH;
+#define STRINGIFY(x) #x
+#define STR(x) STRINGIFY(x)
 
-#ifdef USE_CMAKE_CONFIG_H
-const char *minetest_build_info =
-               "VER=" VERSION_GITHASH " " CMAKE_BUILD_INFO;
-#elif defined(ANDROID)
-const char *minetest_build_info = "android jni";
-#else
-const char *minetest_build_info = "non-cmake";
+const char *g_version_string = VERSION_STRING;
+const char *g_version_hash = VERSION_GITHASH;
+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);