diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2013-06-09 01:48:01 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2013-06-09 01:48:01 +0400 |
| commit | b0d5555a064dedf00c1a6605f8f501fc25978641 (patch) | |
| tree | f0b2f74a7f5f9b4e81355cf96c1d1e3b407d4e11 /intern/cycles/util/util_types.h | |
| parent | 603289ffb228a9ed45a123cf6b7e752d1e184d01 (diff) | |
Fix compilation of cycles for MinGW-w64 after recent commits. MinGW-w64 has conflicting redefinitions of the SSE functions in windows.h, so we will be using this header instead, since we can't always avoid including it instead of the sse headers.
Diffstat (limited to 'intern/cycles/util/util_types.h')
| -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__ |