diff options
| -rw-r--r-- | src/client.cpp | 4 | ||||
| -rw-r--r-- | src/version.cpp | 19 | ||||
| -rw-r--r-- | src/version.h | 7 |
3 files changed, 17 insertions, 13 deletions
diff --git a/src/client.cpp b/src/client.cpp index 601561f7d..459d371c2 100644 --- 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 83b0a4c40..ecfeb95f8 100644 --- 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 6a10a9d43..b23e770aa 100644 --- 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; |