[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57298] trunk/blender/intern/cycles/util/ util_types.h: Fix compilation of cycles for MinGW-w64 after recent commits.

Antony Riakiotakis kalast at gmail.com
Sat Jun 8 23:48:02 CEST 2013


Revision: 57298
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57298
Author:   psy-fi
Date:     2013-06-08 21:48:01 +0000 (Sat, 08 Jun 2013)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/intern/cycles/util/util_types.h

Modified: trunk/blender/intern/cycles/util/util_types.h
===================================================================
--- trunk/blender/intern/cycles/util/util_types.h	2013-06-08 19:56:11 UTC (rev 57297)
+++ trunk/blender/intern/cycles/util/util_types.h	2013-06-08 21:48:01 UTC (rev 57298)
@@ -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__
 




More information about the Bf-blender-cvs mailing list