diff options
| -rw-r--r-- | build_files/scons/config/win64-mingw-config.py | 1 | ||||
| -rw-r--r-- | intern/cycles/util/util_optimization.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/build_files/scons/config/win64-mingw-config.py b/build_files/scons/config/win64-mingw-config.py index f93be284813..60a9c9f84cd 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 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 |