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"