Don't include cmake_config_githash.h into files that don't need it

diff --git a/src/config.h b/src/config.h
index 54c13d4405b9eb988ee05eb15c56c24b0ca7461d..510c5ef1e3a93394dec5e90bcaff0acccb933b94 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -74,11 +74,5 @@
        #define VERSION_EXTRA_STRING CMAKE_VERSION_EXTRA_STRING
 #endif
 
-#ifdef __ANDROID__
-       #include "android_version.h"
-#else
-       #include "cmake_config_githash.h"
-#endif
-
 #endif
 

diff --git a/src/convert_json.cpp b/src/convert_json.cpp
index e79103a16c88d9e01170ba61e57f0eb7e1b04ca0..c5c69d93c32979d364b709f61df28c61908c5e58 100644 (file)
--- a/src/convert_json.cpp
+++ b/src/convert_json.cpp
@@ -27,7 +27,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "log.h"
 #include "main.h" // for g_settings
 #include "settings.h"
-#include "version.h"
 #include "httpfetch.h"
 #include "porting.h"
 

diff --git a/src/version.h b/src/version.h
index 0143d91a4ee4c613804301a9f2297d976d5a3a22..6a10a9d434d5951ae55927c8301632686ea40c47 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -21,6 +21,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #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;