Tomato Branch:
authorThomas Dinges <blender@dingto.org>
Fri, 29 Jun 2012 11:28:01 +0000 (11:28 +0000)
committerThomas Dinges <blender@dingto.org>
Fri, 29 Jun 2012 11:28:01 +0000 (11:28 +0000)
* Disable OCIO on windows per default, we don't have OCIO win libs yet.

build_files/scons/config/win32-mingw-config.py
build_files/scons/config/win32-vc-config.py
build_files/scons/config/win64-mingw-config.py
build_files/scons/config/win64-vc-config.py

index ff19a47adc9d24faa3106cae5a210ce6dcfe8799..f61b128fe9fb469b3e2af829ff27d3e024b8cbb6 100644 (file)
@@ -159,7 +159,7 @@ BF_OIIO_INC = BF_OIIO + '/include'
 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'
index e51e78852dc91ab01bb312e886735af969a35004..10f473f81e08c343c75a5a01a189c708cc97e94d 100644 (file)
@@ -156,7 +156,7 @@ BF_OIIO_INC = '${BF_OIIO}/include'
 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'
index 1b8ad46a0d5d6277fa22fefc1644714456fb583f..ecce9052fd7b10929a9541ddc1eb8d65eecc23da 100644 (file)
@@ -159,7 +159,7 @@ BF_OIIO_INC = '${BF_OIIO}/include'
 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'
index be68e0d1078468aab08da04674d02afefede5c6f..604d8b8f7659d09177da66c7f8e7387997d34c1a 100644 (file)
@@ -153,7 +153,7 @@ BF_OIIO_LIB = 'OpenImageIO'
 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'