forked from bartvdbraak/blender
OpenEXR: Enable again for MSVC 2010
This commit is contained in:
parent
ce3293b2d9
commit
dc67840db6
@ -1122,10 +1122,17 @@ elseif(WIN32)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(WITH_IMAGE_OPENEXR)
|
if(WITH_IMAGE_OPENEXR)
|
||||||
set(OPENEXR ${LIBDIR}/openexr)
|
if(MSVC10)
|
||||||
set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
|
set(OPENEXR ${LIBDIR}/openexr)
|
||||||
set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread Iex)
|
set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/vc_10)
|
||||||
set(OPENEXR_LIBPATH ${OPENEXR}/lib)
|
set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread Iex)
|
||||||
|
set(OPENEXR_LIBPATH ${OPENEXR}/lib/vc_10)
|
||||||
|
else()
|
||||||
|
set(OPENEXR ${LIBDIR}/openexr)
|
||||||
|
set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include)
|
||||||
|
set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread Iex)
|
||||||
|
set(OPENEXR_LIBPATH ${OPENEXR}/lib)
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(WITH_IMAGE_TIFF)
|
if(WITH_IMAGE_TIFF)
|
||||||
@ -1651,9 +1658,6 @@ endif()
|
|||||||
|
|
||||||
# MSVC2010 fails to links C++ libs right
|
# MSVC2010 fails to links C++ libs right
|
||||||
if(MSVC10)
|
if(MSVC10)
|
||||||
if(WITH_IMAGE_OPENEXR)
|
|
||||||
message(WARNING "MSVC 2010 does not support OpenEXR, disabling WITH_IMAGE_OPENEXR. To enable support use Use MSVC 2008")
|
|
||||||
endif()
|
|
||||||
if(WITH_OPENCOLLADA)
|
if(WITH_OPENCOLLADA)
|
||||||
message(WARNING "MSVC 2010 does not support OpenCollada, disabling WITH_OPENCOLLADA. To enable support use Use MSVC 2008")
|
message(WARNING "MSVC 2010 does not support OpenCollada, disabling WITH_OPENCOLLADA. To enable support use Use MSVC 2008")
|
||||||
endif()
|
endif()
|
||||||
|
Loading…
Reference in New Issue
Block a user