diff options
| author | sfan5 <sfan5@live.de> | 2014-07-24 13:04:35 +0200 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2014-07-25 10:48:03 +0200 |
| commit | 5357a17bac1a3e4070e1529be1eaae57a48ed524 (patch) | |
| tree | 5c702bce87a28239732ddda527059780709119f8 | |
| parent | 8979a3dd99fad05582d7308097e326b126ef0da6 (diff) | |
| download | minetest-5357a17bac1a3e4070e1529be1eaae57a48ed524.tar.gz minetest-5357a17bac1a3e4070e1529be1eaae57a48ed524.tar.bz2 minetest-5357a17bac1a3e4070e1529be1eaae57a48ed524.zip | |
Don't include cmake_config_githash.h into files that don't need it
| -rw-r--r-- | src/config.h | 6 | ||||
| -rw-r--r-- | src/convert_json.cpp | 1 | ||||
| -rw-r--r-- | src/version.h | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/config.h b/src/config.h index 54c13d440..510c5ef1e 100644 --- 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 e79103a16..c5c69d93c 100644 --- 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 0143d91a4..6a10a9d43 100644 --- 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; |