Move #includes from version.h to version.cpp

diff --git a/src/client.cpp b/src/client.cpp
index 601561f7d4b57a04ce18058ee3bc84b3012ef4dc..459d371c2f78cc33af9bcf53abecafc731ea1db0 100644 (file)
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -2196,8 +2196,8 @@ void Client::sendReady()
        writeU8(os,VERSION_PATCH_ORIG);
        writeU8(os,0);
 
-       writeU16(os,strlen(CMAKE_VERSION_GITHASH));
-       os.write(CMAKE_VERSION_GITHASH,strlen(CMAKE_VERSION_GITHASH));
+       writeU16(os,strlen(minetest_version_hash));
+       os.write(minetest_version_hash,strlen(minetest_version_hash));
 
        // Make data buffer
        std::string s = os.str();

diff --git a/src/version.cpp b/src/version.cpp
index 83b0a4c40b349f899aba2e7c97c68c0688dc9677..ecfeb95f8613bb1e4f32b7f879d1ed6c84819094 100644 (file)
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -20,16 +20,27 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "version.h"
 #include "config.h"
 
-const char *minetest_version_simple = CMAKE_VERSION_STRING;
-const char *minetest_version_hash = CMAKE_VERSION_GITHASH;
+#ifdef __ANDROID__
+       #include "android_version.h"
+#elif defined(USE_CMAKE_CONFIG_H)
+       #include "cmake_config_githash.h"
+#endif
+
+#ifdef CMAKE_VERSION_GITHASH
+       #define VERSION_GITHASH CMAKE_VERSION_GITHASH
+#else
+       #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=" CMAKE_VERSION_GITHASH " " CMAKE_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
 

diff --git a/src/version.h b/src/version.h
index 6a10a9d434d5951ae55927c8301632686ea40c47..b23e770aa0cee121ebadaa5ea6ab3a6e8d8b4233 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -20,13 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef VERSION_HEADER
 #define VERSION_HEADER
 
-#include "config.h"
-#ifdef __ANDROID__
-       #include "android_version.h"
-#else
-       #include "cmake_config_githash.h"
-#endif
-
 extern const char *minetest_version_simple;
 extern const char *minetest_version_hash;
 extern const char *minetest_build_info;