[Bf-blender-cvs] [d7ad64c] master: Bump OpenEXR to 2.2 for windows MSVC 2013

[Martijn Berger]

Commit: d7ad64cc5e980b87b19569fe056ab17d7292c867
Author: Martijn Berger
Date:   Mon Feb 2 19:44:49 2015 +0100
Branches: master
https://developer.blender.org/rBd7ad64cc5e980b87b19569fe056ab17d7292c867

Bump OpenEXR to 2.2 for windows MSVC 2013

===================================================================

M	CMakeLists.txt
M	build_files/scons/config/win64-vc-config.py

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c755666..abee2a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1343,11 +1343,11 @@ elseif(WIN32)
 			set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
 			set(OPENEXR_LIBPATH ${OPENEXR}/lib)
 			set(OPENEXR_LIBRARIES
-				${OPENEXR_LIBPATH}/Iex-2_1.lib
+				${OPENEXR_LIBPATH}/Iex-2_2.lib
 				${OPENEXR_LIBPATH}/Half.lib
-				${OPENEXR_LIBPATH}/IlmImf-2_1.lib
-				${OPENEXR_LIBPATH}/Imath-2_1.lib
-				${OPENEXR_LIBPATH}/IlmThread-2_1.lib
+				${OPENEXR_LIBPATH}/IlmImf-2_2.lib
+				${OPENEXR_LIBPATH}/Imath-2_2.lib
+				${OPENEXR_LIBPATH}/IlmThread-2_2.lib
 			)
 			endif(NOT OPENEXR_FOUND)
 		endif()
diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py
index e2d23ce..19e9667 100644
--- a/build_files/scons/config/win64-vc-config.py
+++ b/build_files/scons/config/win64-vc-config.py
@@ -66,7 +66,7 @@ WITH_BF_OPENEXR = True
 WITH_BF_STATICOPENEXR = False
 BF_OPENEXR = LIBDIR + '/openexr'
 BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR '
-BF_OPENEXR_LIB = ' Iex-2_1 Half IlmImf-2_1 Imath-2_1 IlmThread-2_1 '
+BF_OPENEXR_LIB = ' Iex-2_2 Half IlmImf-2_2 Imath-2_2 IlmThread-2_2 '
 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'