diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-12-22 19:34:26 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-12-22 20:17:57 +0300 |
| commit | e2c087adf039e9303a945cbd1a72a7cb7b0d8cc6 (patch) | |
| tree | caff97bc5c7f98d12a14d8938c00a5db2114c970 /src | |
| parent | 2da94c63be0dd5ff21442ffdf594d8862ac2c656 (diff) | |
| download | manaverse-e2c087adf039e9303a945cbd1a72a7cb7b0d8cc6.tar.gz manaverse-e2c087adf039e9303a945cbd1a72a7cb7b0d8cc6.tar.bz2 manaverse-e2c087adf039e9303a945cbd1a72a7cb7b0d8cc6.tar.xz manaverse-e2c087adf039e9303a945cbd1a72a7cb7b0d8cc6.zip | |
Fix compilation with old gcc.
Diffstat (limited to 'src')
| -rw-r--r-- | src/localconsts.h | 6 | ||||
| -rw-r--r-- | src/resources/dye/dyepalette_replaceacolor.cpp | 6 | ||||
| -rw-r--r-- | src/resources/dye/dyepalette_replaceaoglcolor.cpp | 6 | ||||
| -rw-r--r-- | src/resources/dye/dyepalette_replacescolor.cpp | 6 | ||||
| -rw-r--r-- | src/resources/dye/dyepalette_replacesoglcolor.cpp | 6 |
5 files changed, 16 insertions, 14 deletions
diff --git a/src/localconsts.h b/src/localconsts.h index 544b85a02..d237d93eb 100644 --- a/src/localconsts.h +++ b/src/localconsts.h @@ -139,9 +139,11 @@ #endif // ENABLE_CILKPLUS #ifdef __x86_64__ -#ifndef __clang__ +#if !defined(__clang__) && defined(__GNUC__) +#if GCC_VERSION >= 40700 #define SIMD_SUPPORTED -#endif // __clang__ +#endif // GCC_VERSION > 40700 +#endif // !defined(__clang__) && defined(__GNUC__) #endif // __x86_64__ #ifdef SIMD_SUPPORTED diff --git a/src/resources/dye/dyepalette_replaceacolor.cpp b/src/resources/dye/dyepalette_replaceacolor.cpp index cb379a4be..b2693912b 100644 --- a/src/resources/dye/dyepalette_replaceacolor.cpp +++ b/src/resources/dye/dyepalette_replaceacolor.cpp @@ -26,10 +26,10 @@ #include <SDL_endian.h> #endif // SDL_BYTEORDER -#ifdef __x86_64__ +#ifdef SIMD_SUPPORTED // avx2 -#include "immintrin.h" -#endif // __x86_64__ +#include <immintrin.h> +#endif // SIMD_SUPPORTED #include "debug.h" diff --git a/src/resources/dye/dyepalette_replaceaoglcolor.cpp b/src/resources/dye/dyepalette_replaceaoglcolor.cpp index 17e9adf36..25e4c6555 100644 --- a/src/resources/dye/dyepalette_replaceaoglcolor.cpp +++ b/src/resources/dye/dyepalette_replaceaoglcolor.cpp @@ -28,10 +28,10 @@ #include <SDL_endian.h> #endif // SDL_BYTEORDER -#ifdef __x86_64__ +#ifdef SIMD_SUPPORTED // avx2 -#include "immintrin.h" -#endif // __x86_64__ +#include <immintrin.h> +#endif // SIMD_SUPPORTED #include "debug.h" diff --git a/src/resources/dye/dyepalette_replacescolor.cpp b/src/resources/dye/dyepalette_replacescolor.cpp index 94b7c1c5c..d6a058773 100644 --- a/src/resources/dye/dyepalette_replacescolor.cpp +++ b/src/resources/dye/dyepalette_replacescolor.cpp @@ -24,10 +24,10 @@ #include <SDL_endian.h> #endif // SDL_BYTEORDER -#ifdef __x86_64__ +#ifdef SIMD_SUPPORTED // avx2 -#include "immintrin.h" -#endif // __x86_64__ +#include <immintrin.h> +#endif // SIMD_SUPPORTED #include "debug.h" diff --git a/src/resources/dye/dyepalette_replacesoglcolor.cpp b/src/resources/dye/dyepalette_replacesoglcolor.cpp index 40b6fb8af..89a73d4c4 100644 --- a/src/resources/dye/dyepalette_replacesoglcolor.cpp +++ b/src/resources/dye/dyepalette_replacesoglcolor.cpp @@ -26,10 +26,10 @@ #include <SDL_endian.h> #endif // SDL_BYTEORDER -#ifdef __x86_64__ +#ifdef SIMD_SUPPORTED // avx2 -#include "immintrin.h" -#endif // __x86_64__ +#include <immintrin.h> +#endif // SIMD_SUPPORTED #include "debug.h" |