[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52364] trunk: Windows Libs: move OpenEXR headers to same directory structure as other platforms.
Brecht Van Lommel
brechtvanlommel at pandora.be
Mon Nov 19 17:02:33 CET 2012
Revision: 52364
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52364
Author: blendix
Date: 2012-11-19 16:02:29 +0000 (Mon, 19 Nov 2012)
Log Message:
-----------
Windows Libs: move OpenEXR headers to same directory structure as other platforms.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/build_files/scons/config/win32-vc-config.py
trunk/blender/build_files/scons/config/win64-vc-config.py
trunk/blender/source/blender/imbuf/intern/openexr/CMakeLists.txt
trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
trunk/lib/win64/openimageio/build.bat
trunk/lib/win64/osl/build.bat
trunk/lib/windows/openimageio/build.bat
trunk/lib/windows/osl/build.bat
Added Paths:
-----------
trunk/lib/win64/openexr/include/OpenEXR/
trunk/lib/win64/openexr/include/OpenEXR/Iex.h
trunk/lib/win64/openexr/include/OpenEXR/IexBaseExc.h
trunk/lib/win64/openexr/include/OpenEXR/IexErrnoExc.h
trunk/lib/win64/openexr/include/OpenEXR/IexMacros.h
trunk/lib/win64/openexr/include/OpenEXR/IexMathExc.h
trunk/lib/win64/openexr/include/OpenEXR/IexThrowErrnoExc.h
trunk/lib/win64/openexr/include/OpenEXR/IlmBaseConfig.h
trunk/lib/win64/openexr/include/OpenEXR/IlmThread.h
trunk/lib/win64/openexr/include/OpenEXR/IlmThreadMutex.h
trunk/lib/win64/openexr/include/OpenEXR/IlmThreadPool.h
trunk/lib/win64/openexr/include/OpenEXR/IlmThreadSemaphore.h
trunk/lib/win64/openexr/include/OpenEXR/ImathBox.h
trunk/lib/win64/openexr/include/OpenEXR/ImathBoxAlgo.h
trunk/lib/win64/openexr/include/OpenEXR/ImathColor.h
trunk/lib/win64/openexr/include/OpenEXR/ImathColorAlgo.h
trunk/lib/win64/openexr/include/OpenEXR/ImathEuler.h
trunk/lib/win64/openexr/include/OpenEXR/ImathExc.h
trunk/lib/win64/openexr/include/OpenEXR/ImathFrame.h
trunk/lib/win64/openexr/include/OpenEXR/ImathFrustum.h
trunk/lib/win64/openexr/include/OpenEXR/ImathFun.h
trunk/lib/win64/openexr/include/OpenEXR/ImathGL.h
trunk/lib/win64/openexr/include/OpenEXR/ImathGLU.h
trunk/lib/win64/openexr/include/OpenEXR/ImathHalfLimits.h
trunk/lib/win64/openexr/include/OpenEXR/ImathInt64.h
trunk/lib/win64/openexr/include/OpenEXR/ImathInterval.h
trunk/lib/win64/openexr/include/OpenEXR/ImathLimits.h
trunk/lib/win64/openexr/include/OpenEXR/ImathLine.h
trunk/lib/win64/openexr/include/OpenEXR/ImathLineAlgo.h
trunk/lib/win64/openexr/include/OpenEXR/ImathMath.h
trunk/lib/win64/openexr/include/OpenEXR/ImathMatrix.h
trunk/lib/win64/openexr/include/OpenEXR/ImathMatrixAlgo.h
trunk/lib/win64/openexr/include/OpenEXR/ImathPlane.h
trunk/lib/win64/openexr/include/OpenEXR/ImathPlatform.h
trunk/lib/win64/openexr/include/OpenEXR/ImathQuat.h
trunk/lib/win64/openexr/include/OpenEXR/ImathRandom.h
trunk/lib/win64/openexr/include/OpenEXR/ImathRoots.h
trunk/lib/win64/openexr/include/OpenEXR/ImathShear.h
trunk/lib/win64/openexr/include/OpenEXR/ImathSphere.h
trunk/lib/win64/openexr/include/OpenEXR/ImathVec.h
trunk/lib/win64/openexr/include/OpenEXR/ImathVecAlgo.h
trunk/lib/win64/openexr/include/OpenEXR/ImfArray.h
trunk/lib/win64/openexr/include/OpenEXR/ImfAttribute.h
trunk/lib/win64/openexr/include/OpenEXR/ImfAutoArray.h
trunk/lib/win64/openexr/include/OpenEXR/ImfB44Compressor.h
trunk/lib/win64/openexr/include/OpenEXR/ImfBoxAttribute.h
trunk/lib/win64/openexr/include/OpenEXR/ImfCRgbaFile.h
trunk/lib/win64/openexr/include/OpenEXR/ImfChannelList.h
trunk/lib/win64/openexr/include/OpenEXR/ImfChannelListAttribute.h
trunk/lib/win64/openexr/include/OpenEXR/ImfChromaticities.h
trunk/lib/win64/openexr/include/OpenEXR/ImfChromaticitiesAttribute.h
trunk/lib/win64/openexr/include/OpenEXR/ImfCompression.h
trunk/lib/win64/openexr/include/OpenEXR/ImfCompressionAttribute.h
trunk/lib/win64/openexr/include/OpenEXR/ImfCompressor.h
trunk/lib/win64/openexr/include/OpenEXR/ImfConvert.h
trunk/lib/win64/openexr/include/OpenEXR/ImfDoubleAttribute.h
trunk/lib/win64/openexr/include/OpenEXR/ImfEnvmap.h
trunk/lib/win64/openexr/include/OpenEXR/ImfEnvmapAttribute.h
trunk/lib/win64/openexr/include/OpenEXR/ImfFloatAttribute.h
trunk/lib/win64/openexr/include/OpenEXR/ImfFrameBuffer.h
trunk/lib/win64/openexr/include/OpenEXR/ImfFramesPerSecond.h
trunk/lib/win64/openexr/include/OpenEXR/ImfHeader.h
trunk/lib/win64/openexr/include/OpenEXR/ImfHuf.h
trunk/lib/win64/openexr/include/OpenEXR/ImfIO.h
trunk/lib/win64/openexr/include/OpenEXR/ImfInputFile.h
trunk/lib/win64/openexr/include/OpenEXR/ImfInt64.h
trunk/lib/win64/openexr/include/OpenEXR/ImfIntAttribute.h
trunk/lib/win64/openexr/include/OpenEXR/ImfKeyCode.h
trunk/lib/win64/openexr/include/OpenEXR/ImfKeyCodeAttribute.h
trunk/lib/win64/openexr/include/OpenEXR/ImfLineOrder.h
trunk/lib/win64/openexr/include/OpenEXR/ImfLineOrderAttribute.h
trunk/lib/win64/openexr/include/OpenEXR/ImfLut.h
trunk/lib/win64/openexr/include/OpenEXR/ImfMatrixAttribute.h
trunk/lib/win64/openexr/include/OpenEXR/ImfMisc.h
trunk/lib/win64/openexr/include/OpenEXR/ImfName.h
trunk/lib/win64/openexr/include/OpenEXR/ImfOpaqueAttribute.h
trunk/lib/win64/openexr/include/OpenEXR/ImfOutputFile.h
trunk/lib/win64/openexr/include/OpenEXR/ImfPixelType.h
trunk/lib/win64/openexr/include/OpenEXR/ImfPizCompressor.h
trunk/lib/win64/openexr/include/OpenEXR/ImfPreviewImage.h
trunk/lib/win64/openexr/include/OpenEXR/ImfPreviewImageAttribute.h
trunk/lib/win64/openexr/include/OpenEXR/ImfPxr24Compressor.h
trunk/lib/win64/openexr/include/OpenEXR/ImfRational.h
trunk/lib/win64/openexr/include/OpenEXR/ImfRationalAttribute.h
trunk/lib/win64/openexr/include/OpenEXR/ImfRgba.h
trunk/lib/win64/openexr/include/OpenEXR/ImfRgbaFile.h
trunk/lib/win64/openexr/include/OpenEXR/ImfRgbaYca.h
trunk/lib/win64/openexr/include/OpenEXR/ImfRleCompressor.h
trunk/lib/win64/openexr/include/OpenEXR/ImfScanLineInputFile.h
trunk/lib/win64/openexr/include/OpenEXR/ImfStandardAttributes.h
trunk/lib/win64/openexr/include/OpenEXR/ImfStdIO.h
trunk/lib/win64/openexr/include/OpenEXR/ImfStringAttribute.h
trunk/lib/win64/openexr/include/OpenEXR/ImfTestFile.h
trunk/lib/win64/openexr/include/OpenEXR/ImfThreading.h
trunk/lib/win64/openexr/include/OpenEXR/ImfTileDescription.h
trunk/lib/win64/openexr/include/OpenEXR/ImfTileDescriptionAttribute.h
trunk/lib/win64/openexr/include/OpenEXR/ImfTileOffsets.h
trunk/lib/win64/openexr/include/OpenEXR/ImfTiledInputFile.h
trunk/lib/win64/openexr/include/OpenEXR/ImfTiledMisc.h
trunk/lib/win64/openexr/include/OpenEXR/ImfTiledOutputFile.h
trunk/lib/win64/openexr/include/OpenEXR/ImfTiledRgbaFile.h
trunk/lib/win64/openexr/include/OpenEXR/ImfTimeCode.h
trunk/lib/win64/openexr/include/OpenEXR/ImfTimeCodeAttribute.h
trunk/lib/win64/openexr/include/OpenEXR/ImfVecAttribute.h
trunk/lib/win64/openexr/include/OpenEXR/ImfVersion.h
trunk/lib/win64/openexr/include/OpenEXR/ImfWav.h
trunk/lib/win64/openexr/include/OpenEXR/ImfXdr.h
trunk/lib/win64/openexr/include/OpenEXR/ImfZipCompressor.h
trunk/lib/win64/openexr/include/OpenEXR/half.h
trunk/lib/win64/openexr/include/OpenEXR/halfFunction.h
trunk/lib/win64/openexr/include/OpenEXR/halfLimits.h
trunk/lib/windows/openexr/include/OpenEXR/
trunk/lib/windows/openexr/include/OpenEXR/Iex.h
trunk/lib/windows/openexr/include/OpenEXR/IexBaseExc.h
trunk/lib/windows/openexr/include/OpenEXR/IexErrnoExc.h
trunk/lib/windows/openexr/include/OpenEXR/IexMacros.h
trunk/lib/windows/openexr/include/OpenEXR/IexMathExc.h
trunk/lib/windows/openexr/include/OpenEXR/IexThrowErrnoExc.h
trunk/lib/windows/openexr/include/OpenEXR/IlmBaseConfig.h
trunk/lib/windows/openexr/include/OpenEXR/IlmThread.h
trunk/lib/windows/openexr/include/OpenEXR/IlmThreadMutex.h
trunk/lib/windows/openexr/include/OpenEXR/IlmThreadPool.h
trunk/lib/windows/openexr/include/OpenEXR/IlmThreadSemaphore.h
trunk/lib/windows/openexr/include/OpenEXR/ImathBox.h
trunk/lib/windows/openexr/include/OpenEXR/ImathBoxAlgo.h
trunk/lib/windows/openexr/include/OpenEXR/ImathColor.h
trunk/lib/windows/openexr/include/OpenEXR/ImathColorAlgo.h
trunk/lib/windows/openexr/include/OpenEXR/ImathEuler.h
trunk/lib/windows/openexr/include/OpenEXR/ImathExc.h
trunk/lib/windows/openexr/include/OpenEXR/ImathFrame.h
trunk/lib/windows/openexr/include/OpenEXR/ImathFrustum.h
trunk/lib/windows/openexr/include/OpenEXR/ImathFun.h
trunk/lib/windows/openexr/include/OpenEXR/ImathGL.h
trunk/lib/windows/openexr/include/OpenEXR/ImathGLU.h
trunk/lib/windows/openexr/include/OpenEXR/ImathHalfLimits.h
trunk/lib/windows/openexr/include/OpenEXR/ImathInt64.h
trunk/lib/windows/openexr/include/OpenEXR/ImathInterval.h
trunk/lib/windows/openexr/include/OpenEXR/ImathLimits.h
trunk/lib/windows/openexr/include/OpenEXR/ImathLine.h
trunk/lib/windows/openexr/include/OpenEXR/ImathLineAlgo.h
trunk/lib/windows/openexr/include/OpenEXR/ImathMath.h
trunk/lib/windows/openexr/include/OpenEXR/ImathMatrix.h
trunk/lib/windows/openexr/include/OpenEXR/ImathMatrixAlgo.h
trunk/lib/windows/openexr/include/OpenEXR/ImathPlane.h
trunk/lib/windows/openexr/include/OpenEXR/ImathPlatform.h
trunk/lib/windows/openexr/include/OpenEXR/ImathQuat.h
trunk/lib/windows/openexr/include/OpenEXR/ImathRandom.h
trunk/lib/windows/openexr/include/OpenEXR/ImathRoots.h
trunk/lib/windows/openexr/include/OpenEXR/ImathShear.h
trunk/lib/windows/openexr/include/OpenEXR/ImathSphere.h
trunk/lib/windows/openexr/include/OpenEXR/ImathVec.h
trunk/lib/windows/openexr/include/OpenEXR/ImathVecAlgo.h
trunk/lib/windows/openexr/include/OpenEXR/ImfArray.h
trunk/lib/windows/openexr/include/OpenEXR/ImfAttribute.h
trunk/lib/windows/openexr/include/OpenEXR/ImfAutoArray.h
trunk/lib/windows/openexr/include/OpenEXR/ImfB44Compressor.h
trunk/lib/windows/openexr/include/OpenEXR/ImfBoxAttribute.h
trunk/lib/windows/openexr/include/OpenEXR/ImfCRgbaFile.h
trunk/lib/windows/openexr/include/OpenEXR/ImfChannelList.h
trunk/lib/windows/openexr/include/OpenEXR/ImfChannelListAttribute.h
trunk/lib/windows/openexr/include/OpenEXR/ImfChromaticities.h
trunk/lib/windows/openexr/include/OpenEXR/ImfChromaticitiesAttribute.h
trunk/lib/windows/openexr/include/OpenEXR/ImfCompression.h
trunk/lib/windows/openexr/include/OpenEXR/ImfCompressionAttribute.h
trunk/lib/windows/openexr/include/OpenEXR/ImfCompressor.h
trunk/lib/windows/openexr/include/OpenEXR/ImfConvert.h
trunk/lib/windows/openexr/include/OpenEXR/ImfDoubleAttribute.h
trunk/lib/windows/openexr/include/OpenEXR/ImfEnvmap.h
trunk/lib/windows/openexr/include/OpenEXR/ImfEnvmapAttribute.h
trunk/lib/windows/openexr/include/OpenEXR/ImfFloatAttribute.h
trunk/lib/windows/openexr/include/OpenEXR/ImfFrameBuffer.h
trunk/lib/windows/openexr/include/OpenEXR/ImfFramesPerSecond.h
trunk/lib/windows/openexr/include/OpenEXR/ImfHeader.h
trunk/lib/windows/openexr/include/OpenEXR/ImfHuf.h
trunk/lib/windows/openexr/include/OpenEXR/ImfIO.h
trunk/lib/windows/openexr/include/OpenEXR/ImfInputFile.h
trunk/lib/windows/openexr/include/OpenEXR/ImfInt64.h
trunk/lib/windows/openexr/include/OpenEXR/ImfIntAttribute.h
trunk/lib/windows/openexr/include/OpenEXR/ImfKeyCode.h
trunk/lib/windows/openexr/include/OpenEXR/ImfKeyCodeAttribute.h
trunk/lib/windows/openexr/include/OpenEXR/ImfLineOrder.h
trunk/lib/windows/openexr/include/OpenEXR/ImfLineOrderAttribute.h
trunk/lib/windows/openexr/include/OpenEXR/ImfLut.h
trunk/lib/windows/openexr/include/OpenEXR/ImfMatrixAttribute.h
trunk/lib/windows/openexr/include/OpenEXR/ImfMisc.h
trunk/lib/windows/openexr/include/OpenEXR/ImfName.h
trunk/lib/windows/openexr/include/OpenEXR/ImfOpaqueAttribute.h
trunk/lib/windows/openexr/include/OpenEXR/ImfOutputFile.h
trunk/lib/windows/openexr/include/OpenEXR/ImfPixelType.h
trunk/lib/windows/openexr/include/OpenEXR/ImfPizCompressor.h
trunk/lib/windows/openexr/include/OpenEXR/ImfPreviewImage.h
trunk/lib/windows/openexr/include/OpenEXR/ImfPreviewImageAttribute.h
trunk/lib/windows/openexr/include/OpenEXR/ImfPxr24Compressor.h
trunk/lib/windows/openexr/include/OpenEXR/ImfRational.h
trunk/lib/windows/openexr/include/OpenEXR/ImfRationalAttribute.h
trunk/lib/windows/openexr/include/OpenEXR/ImfRgba.h
trunk/lib/windows/openexr/include/OpenEXR/ImfRgbaFile.h
trunk/lib/windows/openexr/include/OpenEXR/ImfRgbaYca.h
trunk/lib/windows/openexr/include/OpenEXR/ImfRleCompressor.h
trunk/lib/windows/openexr/include/OpenEXR/ImfScanLineInputFile.h
trunk/lib/windows/openexr/include/OpenEXR/ImfStandardAttributes.h
trunk/lib/windows/openexr/include/OpenEXR/ImfStdIO.h
trunk/lib/windows/openexr/include/OpenEXR/ImfStringAttribute.h
trunk/lib/windows/openexr/include/OpenEXR/ImfTestFile.h
trunk/lib/windows/openexr/include/OpenEXR/ImfThreading.h
trunk/lib/windows/openexr/include/OpenEXR/ImfTileDescription.h
trunk/lib/windows/openexr/include/OpenEXR/ImfTileDescriptionAttribute.h
trunk/lib/windows/openexr/include/OpenEXR/ImfTileOffsets.h
trunk/lib/windows/openexr/include/OpenEXR/ImfTiledInputFile.h
trunk/lib/windows/openexr/include/OpenEXR/ImfTiledMisc.h
trunk/lib/windows/openexr/include/OpenEXR/ImfTiledOutputFile.h
trunk/lib/windows/openexr/include/OpenEXR/ImfTiledRgbaFile.h
trunk/lib/windows/openexr/include/OpenEXR/ImfTimeCode.h
trunk/lib/windows/openexr/include/OpenEXR/ImfTimeCodeAttribute.h
trunk/lib/windows/openexr/include/OpenEXR/ImfVecAttribute.h
trunk/lib/windows/openexr/include/OpenEXR/ImfVersion.h
trunk/lib/windows/openexr/include/OpenEXR/ImfWav.h
trunk/lib/windows/openexr/include/OpenEXR/ImfXdr.h
trunk/lib/windows/openexr/include/OpenEXR/ImfZipCompressor.h
trunk/lib/windows/openexr/include/OpenEXR/half.h
trunk/lib/windows/openexr/include/OpenEXR/halfFunction.h
trunk/lib/windows/openexr/include/OpenEXR/halfLimits.h
Removed Paths:
-------------
trunk/lib/win64/openexr/include/Iex/Iex.h
trunk/lib/win64/openexr/include/Iex/IexBaseExc.h
trunk/lib/win64/openexr/include/Iex/IexErrnoExc.h
trunk/lib/win64/openexr/include/Iex/IexMacros.h
trunk/lib/win64/openexr/include/Iex/IexMathExc.h
trunk/lib/win64/openexr/include/Iex/IexThrowErrnoExc.h
trunk/lib/win64/openexr/include/IlmBaseConfig.h
trunk/lib/win64/openexr/include/IlmImf/ImfArray.h
trunk/lib/win64/openexr/include/IlmImf/ImfAttribute.h
trunk/lib/win64/openexr/include/IlmImf/ImfAutoArray.h
trunk/lib/win64/openexr/include/IlmImf/ImfB44Compressor.h
trunk/lib/win64/openexr/include/IlmImf/ImfBoxAttribute.h
trunk/lib/win64/openexr/include/IlmImf/ImfCRgbaFile.h
trunk/lib/win64/openexr/include/IlmImf/ImfChannelList.h
trunk/lib/win64/openexr/include/IlmImf/ImfChannelListAttribute.h
trunk/lib/win64/openexr/include/IlmImf/ImfChromaticities.h
trunk/lib/win64/openexr/include/IlmImf/ImfChromaticitiesAttribute.h
trunk/lib/win64/openexr/include/IlmImf/ImfCompression.h
trunk/lib/win64/openexr/include/IlmImf/ImfCompressionAttribute.h
trunk/lib/win64/openexr/include/IlmImf/ImfCompressor.h
trunk/lib/win64/openexr/include/IlmImf/ImfConvert.h
trunk/lib/win64/openexr/include/IlmImf/ImfDoubleAttribute.h
trunk/lib/win64/openexr/include/IlmImf/ImfEnvmap.h
trunk/lib/win64/openexr/include/IlmImf/ImfEnvmapAttribute.h
trunk/lib/win64/openexr/include/IlmImf/ImfFloatAttribute.h
trunk/lib/win64/openexr/include/IlmImf/ImfFrameBuffer.h
trunk/lib/win64/openexr/include/IlmImf/ImfFramesPerSecond.h
trunk/lib/win64/openexr/include/IlmImf/ImfHeader.h
trunk/lib/win64/openexr/include/IlmImf/ImfHuf.h
trunk/lib/win64/openexr/include/IlmImf/ImfIO.h
trunk/lib/win64/openexr/include/IlmImf/ImfInputFile.h
trunk/lib/win64/openexr/include/IlmImf/ImfInt64.h
trunk/lib/win64/openexr/include/IlmImf/ImfIntAttribute.h
trunk/lib/win64/openexr/include/IlmImf/ImfKeyCode.h
trunk/lib/win64/openexr/include/IlmImf/ImfKeyCodeAttribute.h
trunk/lib/win64/openexr/include/IlmImf/ImfLineOrder.h
trunk/lib/win64/openexr/include/IlmImf/ImfLineOrderAttribute.h
trunk/lib/win64/openexr/include/IlmImf/ImfLut.h
trunk/lib/win64/openexr/include/IlmImf/ImfMatrixAttribute.h
trunk/lib/win64/openexr/include/IlmImf/ImfMisc.h
trunk/lib/win64/openexr/include/IlmImf/ImfName.h
trunk/lib/win64/openexr/include/IlmImf/ImfOpaqueAttribute.h
trunk/lib/win64/openexr/include/IlmImf/ImfOutputFile.h
trunk/lib/win64/openexr/include/IlmImf/ImfPixelType.h
trunk/lib/win64/openexr/include/IlmImf/ImfPizCompressor.h
trunk/lib/win64/openexr/include/IlmImf/ImfPreviewImage.h
trunk/lib/win64/openexr/include/IlmImf/ImfPreviewImageAttribute.h
trunk/lib/win64/openexr/include/IlmImf/ImfPxr24Compressor.h
trunk/lib/win64/openexr/include/IlmImf/ImfRational.h
trunk/lib/win64/openexr/include/IlmImf/ImfRationalAttribute.h
trunk/lib/win64/openexr/include/IlmImf/ImfRgba.h
trunk/lib/win64/openexr/include/IlmImf/ImfRgbaFile.h
trunk/lib/win64/openexr/include/IlmImf/ImfRgbaYca.h
trunk/lib/win64/openexr/include/IlmImf/ImfRleCompressor.h
trunk/lib/win64/openexr/include/IlmImf/ImfScanLineInputFile.h
trunk/lib/win64/openexr/include/IlmImf/ImfStandardAttributes.h
trunk/lib/win64/openexr/include/IlmImf/ImfStdIO.h
trunk/lib/win64/openexr/include/IlmImf/ImfStringAttribute.h
trunk/lib/win64/openexr/include/IlmImf/ImfTestFile.h
trunk/lib/win64/openexr/include/IlmImf/ImfThreading.h
trunk/lib/win64/openexr/include/IlmImf/ImfTileDescription.h
trunk/lib/win64/openexr/include/IlmImf/ImfTileDescriptionAttribute.h
trunk/lib/win64/openexr/include/IlmImf/ImfTileOffsets.h
trunk/lib/win64/openexr/include/IlmImf/ImfTiledInputFile.h
trunk/lib/win64/openexr/include/IlmImf/ImfTiledMisc.h
trunk/lib/win64/openexr/include/IlmImf/ImfTiledOutputFile.h
trunk/lib/win64/openexr/include/IlmImf/ImfTiledRgbaFile.h
trunk/lib/win64/openexr/include/IlmImf/ImfTimeCode.h
trunk/lib/win64/openexr/include/IlmImf/ImfTimeCodeAttribute.h
trunk/lib/win64/openexr/include/IlmImf/ImfVecAttribute.h
trunk/lib/win64/openexr/include/IlmImf/ImfVersion.h
trunk/lib/win64/openexr/include/IlmImf/ImfWav.h
trunk/lib/win64/openexr/include/IlmImf/ImfXdr.h
trunk/lib/win64/openexr/include/IlmImf/ImfZipCompressor.h
trunk/lib/win64/openexr/include/IlmThread/IlmThread.h
trunk/lib/win64/openexr/include/IlmThread/IlmThreadMutex.h
trunk/lib/win64/openexr/include/IlmThread/IlmThreadPool.h
trunk/lib/win64/openexr/include/IlmThread/IlmThreadSemaphore.h
trunk/lib/win64/openexr/include/Imath/ImathBox.h
trunk/lib/win64/openexr/include/Imath/ImathBoxAlgo.h
trunk/lib/win64/openexr/include/Imath/ImathColor.h
trunk/lib/win64/openexr/include/Imath/ImathColorAlgo.h
trunk/lib/win64/openexr/include/Imath/ImathEuler.h
trunk/lib/win64/openexr/include/Imath/ImathExc.h
trunk/lib/win64/openexr/include/Imath/ImathFrame.h
trunk/lib/win64/openexr/include/Imath/ImathFrustum.h
trunk/lib/win64/openexr/include/Imath/ImathFun.h
trunk/lib/win64/openexr/include/Imath/ImathGL.h
trunk/lib/win64/openexr/include/Imath/ImathGLU.h
trunk/lib/win64/openexr/include/Imath/ImathHalfLimits.h
trunk/lib/win64/openexr/include/Imath/ImathInt64.h
trunk/lib/win64/openexr/include/Imath/ImathInterval.h
trunk/lib/win64/openexr/include/Imath/ImathLimits.h
trunk/lib/win64/openexr/include/Imath/ImathLine.h
trunk/lib/win64/openexr/include/Imath/ImathLineAlgo.h
trunk/lib/win64/openexr/include/Imath/ImathMath.h
trunk/lib/win64/openexr/include/Imath/ImathMatrix.h
trunk/lib/win64/openexr/include/Imath/ImathMatrixAlgo.h
trunk/lib/win64/openexr/include/Imath/ImathPlane.h
trunk/lib/win64/openexr/include/Imath/ImathPlatform.h
trunk/lib/win64/openexr/include/Imath/ImathQuat.h
trunk/lib/win64/openexr/include/Imath/ImathRandom.h
trunk/lib/win64/openexr/include/Imath/ImathRoots.h
trunk/lib/win64/openexr/include/Imath/ImathShear.h
trunk/lib/win64/openexr/include/Imath/ImathSphere.h
trunk/lib/win64/openexr/include/Imath/ImathVec.h
trunk/lib/win64/openexr/include/Imath/ImathVecAlgo.h
trunk/lib/win64/openexr/include/half.h
trunk/lib/win64/openexr/include/halfFunction.h
trunk/lib/win64/openexr/include/halfLimits.h
trunk/lib/windows/openexr/include/Iex/
trunk/lib/windows/openexr/include/IlmBaseConfig.h
trunk/lib/windows/openexr/include/IlmImf/
trunk/lib/windows/openexr/include/IlmThread/
trunk/lib/windows/openexr/include/Imath/
trunk/lib/windows/openexr/include/half.h
trunk/lib/windows/openexr/include/halfFunction.h
trunk/lib/windows/openexr/include/halfLimits.h
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2012-11-19 15:50:28 UTC (rev 52363)
+++ trunk/blender/CMakeLists.txt 2012-11-19 16:02:29 UTC (rev 52364)
@@ -1046,6 +1046,7 @@
if(WITH_IMAGE_OPENEXR)
set_lib_path(OPENEXR "openexr")
set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
+ set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
set(OPENEXR_LIBPATH ${OPENEXR}/lib)
set(OPENEXR_LIBRARIES
${OPENEXR_LIBPATH}/Iex.lib
@@ -1054,12 +1055,6 @@
${OPENEXR_LIBPATH}/Imath.lib
${OPENEXR_LIBPATH}/IlmThread.lib
)
- set(OPENEXR_INCLUDE_DIRS
- ${OPENEXR_INCLUDE_DIR}
- ${OPENEXR_INCLUDE_DIR}/IlmImf
- ${OPENEXR_INCLUDE_DIR}/Iex
- ${OPENEXR_INCLUDE_DIR}/Imath
- )
endif()
if(WITH_IMAGE_TIFF)
Modified: trunk/blender/build_files/scons/config/win32-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-vc-config.py 2012-11-19 15:50:28 UTC (rev 52363)
+++ trunk/blender/build_files/scons/config/win32-vc-config.py 2012-11-19 16:02:29 UTC (rev 52364)
@@ -54,7 +54,7 @@
WITH_BF_OPENEXR = True
WITH_BF_STATICOPENEXR = False
BF_OPENEXR = LIBDIR + '/openexr'
-BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/IlmImf ${BF_OPENEXR}/include/Iex ${BF_OPENEXR}/include/Imath '
+BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR '
BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread '
BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
Modified: trunk/blender/build_files/scons/config/win64-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win64-vc-config.py 2012-11-19 15:50:28 UTC (rev 52363)
+++ trunk/blender/build_files/scons/config/win64-vc-config.py 2012-11-19 16:02:29 UTC (rev 52364)
@@ -50,7 +50,7 @@
WITH_BF_OPENEXR = True
WITH_BF_STATICOPENEXR = False
BF_OPENEXR = LIBDIR + '/openexr'
-BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/IlmImf ${BF_OPENEXR}/include/Iex ${BF_OPENEXR}/include/Imath '
+BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR '
BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread '
BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
Modified: trunk/blender/source/blender/imbuf/intern/openexr/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/imbuf/intern/openexr/CMakeLists.txt 2012-11-19 15:50:28 UTC (rev 52363)
+++ trunk/blender/source/blender/imbuf/intern/openexr/CMakeLists.txt 2012-11-19 16:02:29 UTC (rev 52364)
@@ -52,4 +52,6 @@
add_definitions(-DWITH_OPENEXR)
endif()
+message(STATUS "EXR ${INC_SYS}")
+
blender_add_lib(bf_imbuf_openexr "${SRC}" "${INC}" "${INC_SYS}")
Modified: trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
===================================================================
--- trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp 2012-11-19 15:50:28 UTC (rev 52363)
+++ trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp 2012-11-19 16:02:29 UTC (rev 52364)
@@ -72,22 +72,7 @@
#include <iostream>
-#if defined(_WIN32) && !defined(FREE_WINDOWS)
#include <half.h>
-#include <Iex/Iex.h>
-#include <IlmImf/ImfVersion.h>
-#include <IlmImf/ImfArray.h>
-#include <IlmImf/ImfIO.h>
-#include <IlmImf/ImfChannelList.h>
-#include <IlmImf/ImfPixelType.h>
-#include <IlmImf/ImfInputFile.h>
-#include <IlmImf/ImfOutputFile.h>
-#include <IlmImf/ImfCompression.h>
-#include <IlmImf/ImfCompressionAttribute.h>
-#include <IlmImf/ImfStringAttribute.h>
-#include <Imath/ImathBox.h>
-#else
-#include <half.h>
#include <Iex.h>
#include <ImfVersion.h>
#include <ImathBox.h>
@@ -100,7 +85,6 @@
#include <ImfCompression.h>
#include <ImfCompressionAttribute.h>
#include <ImfStringAttribute.h>
-#endif
using namespace Imf;
using namespace Imath;
Deleted: trunk/lib/win64/openexr/include/Iex/Iex.h
===================================================================
--- trunk/lib/win64/openexr/include/Iex/Iex.h 2012-11-19 15:50:28 UTC (rev 52363)
+++ trunk/lib/win64/openexr/include/Iex/Iex.h 2012-11-19 16:02:29 UTC (rev 52364)
@@ -1,60 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2002, Industrial Light & Magic, a division of Lucas
-// Digital Ltd. LLC
-//
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Industrial Light & Magic nor the names of
-// its contributors may be used to endorse or promote products derived
-// from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef INCLUDED_IEX_H
-#define INCLUDED_IEX_H
-
-
-//--------------------------------
-//
-// Exception handling
-//
-//--------------------------------
-
-
-#include "IexMacros.h"
-#include "IexBaseExc.h"
-#include "IexMathExc.h"
-#include "IexThrowErrnoExc.h"
-
-// Note that we do not include file IexErrnoExc.h here. That file
-// defines over 150 classes and significantly slows down compilation.
-// If you throw ErrnoExc exceptions using the throwErrnoExc() function,
-// you don't need IexErrnoExc.h. You have to include IexErrnoExc.h
-// only if you want to catch specific subclasses of ErrnoExc.
-
-
-#endif
Deleted: trunk/lib/win64/openexr/include/Iex/IexBaseExc.h
===================================================================
--- trunk/lib/win64/openexr/include/Iex/IexBaseExc.h 2012-11-19 15:50:28 UTC (rev 52363)
+++ trunk/lib/win64/openexr/include/Iex/IexBaseExc.h 2012-11-19 16:02:29 UTC (rev 52364)
@@ -1,266 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2002, Industrial Light & Magic, a division of Lucas
-// Digital Ltd. LLC
-//
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Industrial Light & Magic nor the names of
-// its contributors may be used to endorse or promote products derived
-// from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef INCLUDED_IEXBASEEXC_H
-#define INCLUDED_IEXBASEEXC_H
-
-
-//----------------------------------------------------------
-//
-// A general exception base class, and a few
-// useful exceptions derived from the base class.
-//
-//----------------------------------------------------------
-
-#include <string>
-#include <exception>
-#include <sstream>
-
-namespace Iex {
-
-#if (defined _WIN32 || defined _WIN64) && defined _MSC_VER
-// Tell MS VC++ to suppress exception specification warnings
-#pragma warning(disable:4290)
-#endif
-
-//-------------------------------
-// Our most basic exception class
-//-------------------------------
-
-class BaseExc: public std::string, public std::exception
-{
- public:
-
- //----------------------------
- // Constructors and destructor
- //----------------------------
-
- BaseExc (const char *s = 0) throw(); // std::string (s)
- BaseExc (const std::string &s) throw(); // std::string (s)
- BaseExc (std::stringstream &s) throw(); // std::string (s.str())
-
- BaseExc (const BaseExc &be) throw();
- virtual ~BaseExc () throw ();
-
- //--------------------------------------------
- // what() method -- e.what() returns e.c_str()
- //--------------------------------------------
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list