[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50669] trunk/blender: * Enable opencolorio for scons/mingw32 (coming very soon)

[Antony Riakiotakis]

Revision: 50669
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50669
Author:   psy-fi
Date:     2012-09-16 20:26:28 +0000 (Sun, 16 Sep 2012)
Log Message:
-----------
* Enable opencolorio for scons/mingw32 (coming very soon)
* Change names of libraries for mingw32 boost to 1.49

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/build_files/scons/config/win32-mingw-config.py

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2012-09-16 19:06:17 UTC (rev 50668)
+++ trunk/blender/CMakeLists.txt	2012-09-16 20:26:28 UTC (rev 50669)
@@ -1245,8 +1245,8 @@
 				set(BOOST_POSTFIX "mgw47-mt-s-1_49")
 				set(BOOST_DEBUG_POSTFIX "mgw47-mt-sd-1_49")
 			else()
-				set(BOOST_POSTFIX "mgw46-mt-s-1_47")
-				set(BOOST_DEBUG_POSTFIX "mgw46-mt-sd-1_47")
+				set(BOOST_POSTFIX "mgw46-mt-s-1_49")
+				set(BOOST_DEBUG_POSTFIX "mgw46-mt-sd-1_49")
 			endif()		
 			set(BOOST_LIBRARIES
 				optimized boost_date_time-${BOOST_POSTFIX} boost_filesystem-${BOOST_POSTFIX}

Modified: trunk/blender/build_files/scons/config/win32-mingw-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-mingw-config.py	2012-09-16 19:06:17 UTC (rev 50668)
+++ trunk/blender/build_files/scons/config/win32-mingw-config.py	2012-09-16 20:26:28 UTC (rev 50669)
@@ -159,7 +159,7 @@
 BF_OIIO_LIB = 'OpenImageIO'
 BF_OIIO_LIBPATH = BF_OIIO + '/lib'
 
-WITH_BF_OCIO = False
+WITH_BF_OCIO = True
 BF_OCIO = LIBDIR + '/opencolorio'
 BF_OCIO_INC = BF_OCIO + '/include'
 BF_OCIO_LIB = 'OpenColorIO'