diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-04-10 20:35:10 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-04-10 20:35:10 +0300 |
| commit | 35812e65f42681e7ade107ad1c703532e2cf1e17 (patch) | |
| tree | 7bc483edebb4247e805644ab3385bb4905562a44 /intern/cycles/device/device_cpu.cpp | |
| parent | d850fd8244d3aee72ad8a1aadda98dd2a6bcb1eb (diff) | |
Cycles: Fix compilation error on windows after recent logging changes
Diffstat (limited to 'intern/cycles/device/device_cpu.cpp')
| -rw-r--r-- | intern/cycles/device/device_cpu.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp index 63735df88ab..013f656e31c 100644 --- a/intern/cycles/device/device_cpu.cpp +++ b/intern/cycles/device/device_cpu.cpp @@ -19,6 +19,15 @@ /* So ImathMath is included before our kernel_cpu_compat. */ #ifdef WITH_OSL +# if defined(_MSC_VER) +/* Prevent OSL from polluting the context with weird macros from windows.h. + * TODO(sergey): Ideally it's only enough to have class/struct declarations in + * the header and skip header include here. + */ +# define NOGDI +# define NOMINMAX +# define WIN32_LEAN_AND_MEAN +# endif # include <OSL/oslexec.h> #endif |