Page MenuHome

[MSVC2015/Cycles] Fix Cycles logging.
AbandonedPublic

Authored by LazyDodo (LazyDodo) on May 21 2016, 2:40 AM.

Details

Summary

I'm unsure why it's not a problem for 2013, but with msvc2015 oiio drags in windows.h before we defined NOGDI which causes the ERROR macro to be defined, which in turn makes glog very unhappy.

this patch makes sure we defined NOGDI by including utils_windows.h before including the oiio headers.

Diff Detail

Repository
rB Blender

Event Timeline

LazyDodo (LazyDodo) retitled this revision from to [MSVC2015/Cycles] Fix Cycles logging..May 21 2016, 2:40 AM
LazyDodo (LazyDodo) updated this object.
LazyDodo (LazyDodo) set the repository for this revision to rB Blender.
LazyDodo (LazyDodo) updated this revision to Diff 6729.
Martijn Berger (juicyfruit) requested changes to this revision.

I actually this should be considered a OIIO bug and i think we patched the 2013 headers for this.

https://developer.blender.org/diffusion/BL/browse/trunk/lib/win64_vc12/OpenImageIO/OpenImageIO_GDI.patch

This revision now requires changes to proceed.May 21 2016, 11:11 AM

In that case, please try to have it fixed upstream. :)

Given the currently supported version has this issue, i'm gonna patch it on the oiio side in my dependencies build script, if oiio upstream releases a new version with fix we'll remove the patch on our side.

fixed elsewhere