From 587167e940228e52e5df5e4b5ecb7b5ff1ea1a7b Mon Sep 17 00:00:00 2001 From: Kahrl Date: Sat, 9 Aug 2014 22:05:09 +0200 Subject: Move #includes from version.h to version.cpp --- src/version.cpp | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'src/version.cpp') 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 -- cgit v1.2.3