diff options
-rw-r--r-- | intern/cycles/util/util_types.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/intern/cycles/util/util_types.h b/intern/cycles/util/util_types.h index 0bc67f0618a..472a707d8fd 100644 --- a/intern/cycles/util/util_types.h +++ b/intern/cycles/util/util_types.h @@ -80,8 +80,14 @@ #ifdef __x86_64__ +/* MinGW64 has conflicting declarations for these SSE headers in <windows.h>. + * Since we can't avoid including <windows.h>, better only include that */ +#ifdef FREE_WINDOWS64 +#include <windows.h> +#else #include <xmmintrin.h> /* SSE 1 */ #include <emmintrin.h> /* SSE 2 */ +#endif #define __KERNEL_SSE2__ |