[Bf-blender-cvs] [7b6c9d2] master: Cycles: Fix compilation error with MinGW and logging enabled

[Sergey Sharybin]

Commit: 7b6c9d23cf93a90c5290160854258761f655d926
Author: Sergey Sharybin
Date:   Mon Dec 8 19:36:56 2014 +0500
Branches: master
https://developer.blender.org/rB7b6c9d23cf93a90c5290160854258761f655d926

Cycles: Fix compilation error with MinGW and logging enabled

===================================================================

M	build_files/scons/config/win64-mingw-config.py
M	intern/cycles/util/util_optimization.h

===================================================================

diff --git a/build_files/scons/config/win64-mingw-config.py b/build_files/scons/config/win64-mingw-config.py
index f93be28..60a9c9f 100644
--- a/build_files/scons/config/win64-mingw-config.py
+++ b/build_files/scons/config/win64-mingw-config.py
@@ -142,7 +142,6 @@ BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib/opencollada'
 
 #Cycles
 WITH_BF_CYCLES = True
-WITH_BF_CYCLES_LOGGING = False
 WITH_BF_CYCLES_CUDA_BINARIES = False
 BF_CYCLES_CUDA_NVCC = "" # Path to the NVIDIA CUDA compiler
 BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35', 'sm_50']
diff --git a/intern/cycles/util/util_optimization.h b/intern/cycles/util/util_optimization.h
index 2feb3d6..fba8b11 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