Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-12-08 17:36:56 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2014-12-08 17:37:41 +0300
commit7b6c9d23cf93a90c5290160854258761f655d926 (patch)
tree01524d4e0bbff5eca7b27a364ba9c7a662ccb482 /intern
parentc07f6c02b325c6188a013462a4de1b53ce17cbcb (diff)
Cycles: Fix compilation error with MinGW and logging enabled
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/util/util_optimization.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/util/util_optimization.h b/intern/cycles/util/util_optimization.h
index 2feb3d6ab7e..fba8b1105f3 100644
--- a/intern/cycles/util/util_optimization.h
+++ b/intern/cycles/util/util_optimization.h
@@ -130,6 +130,9 @@
/* MinGW64 has conflicting declarations for these SSE headers in <windows.h>.
* Since we can't avoid including <windows.h>, better only include that */
+#define NOGDI
+#define NOMINMAX
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#endif