X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fversion.cpp;h=ca206bded99b5c9c168863855dc1807b37079a7d;hb=006ef5b4a5e362eed848ca26b411a8059d74b965;hp=ecfeb95f8613bb1e4f32b7f879d1ed6c84819094;hpb=587167e940228e52e5df5e4b5ecb7b5ff1ea1a7b;p=oweals%2Fminetest.git

diff --git a/src/version.cpp b/src/version.cpp
index ecfeb95f8..ca206bded 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -20,27 +20,19 @@ 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;
 
-#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";
-#endif
+const char *g_version_string = VERSION_STRING;
+const char *g_version_hash = VERSION_GITHASH;
+const char *g_build_info = "VER=" VERSION_GITHASH " " BUILD_INFO;