Revision: 48401
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48401
Author: dingto
Date: 2012-06-29 11:28:01 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Tomato Branch:
* Disable OCIO on windows per default, we don't have OCIO win libs yet.
Modified Paths:
--------------
branches/soc-2011-tomato/build_files/scons/config/win32-mingw-config.py
branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py
branches/soc-2011-tomato/build_files/scons/config/win64-mingw-config.py
branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py
Modified:
branches/soc-2011-tomato/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win32-mingw-config.py
2012-06-29 11:27:58 UTC (rev 48400)
+++ branches/soc-2011-tomato/build_files/scons/config/win32-mingw-config.py
2012-06-29 11:28:01 UTC (rev 48401)
@@ -159,7 +159,7 @@
BF_OIIO_LIB = 'OpenImageIO'
BF_OIIO_LIBPATH = BF_OIIO + '/lib'
-WITH_BF_OCIO = True
+WITH_BF_OCIO = False
BF_OCIO = LIBDIR + '/opencolorio'
BF_OCIO_INC = BF_OCIO + '/include'
BF_OCIO_LIB = 'OpenColorIO'
Modified: branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py
2012-06-29 11:27:58 UTC (rev 48400)
+++ branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py
2012-06-29 11:28:01 UTC (rev 48401)
@@ -156,7 +156,7 @@
BF_OIIO_LIB = 'OpenImageIO'
BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
-WITH_BF_OCIO = True
+WITH_BF_OCIO = False
BF_OCIO = '${LIBDIR}/opencolorio'
BF_OCIO_INC = '${BF_OCIO}/include'
BF_OCIO_LIB = 'OpenColorIO'
Modified:
branches/soc-2011-tomato/build_files/scons/config/win64-mingw-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win64-mingw-config.py
2012-06-29 11:27:58 UTC (rev 48400)
+++ branches/soc-2011-tomato/build_files/scons/config/win64-mingw-config.py
2012-06-29 11:28:01 UTC (rev 48401)
@@ -159,7 +159,7 @@
BF_OIIO_LIB = 'OpenImageIO'
BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
-WITH_BF_OCIO = True
+WITH_BF_OCIO = False
BF_OCIO = LIBDIR + '/opencolorio'
BF_OCIO_INC = '${BF_OCIO}/include'
BF_OCIO_LIB = 'OpenColorIO'
Modified: branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py
2012-06-29 11:27:58 UTC (rev 48400)
+++ branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py
2012-06-29 11:28:01 UTC (rev 48401)
@@ -153,7 +153,7 @@
BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
-WITH_BF_OCIO = True
+WITH_BF_OCIO = False
BF_OCIO = '${LIBDIR}/opencolorio'
BF_OCIO_INC = '${BF_OCIO}/include'
BF_OCIO_LIB = 'OpenColorIO'
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
