forked from bartvdbraak/blender
Fix for oiio/ocio/boost in those scons config, else specifying a custom "root" path for those libs in user-config.py is useless!
This commit is contained in:
parent
2417967267
commit
7138beaa64
@ -278,22 +278,22 @@ WITH_BF_CYCLES = True
|
|||||||
|
|
||||||
WITH_BF_OIIO = True
|
WITH_BF_OIIO = True
|
||||||
BF_OIIO = LIBDIR + '/openimageio'
|
BF_OIIO = LIBDIR + '/openimageio'
|
||||||
BF_OIIO_INC = BF_OIIO + '/include'
|
BF_OIIO_INC = '${BF_OIIO}/include'
|
||||||
BF_OIIO_LIB = 'OpenImageIO'
|
BF_OIIO_LIB = 'OpenImageIO'
|
||||||
BF_OIIO_LIBPATH = BF_OIIO + '/lib'
|
BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
|
||||||
|
|
||||||
WITH_BF_OCIO = True
|
WITH_BF_OCIO = True
|
||||||
BF_OCIO = LIBDIR + '/opencolorio'
|
BF_OCIO = LIBDIR + '/opencolorio'
|
||||||
BF_OCIO_INC = BF_OCIO + '/include'
|
BF_OCIO_INC = '${BF_OCIO}/include'
|
||||||
BF_OCIO_LIB = 'OpenColorIO tinyxml yaml-cpp'
|
BF_OCIO_LIB = 'OpenColorIO tinyxml yaml-cpp'
|
||||||
BF_OCIO_LIBPATH = BF_OCIO + '/lib'
|
BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
|
||||||
|
|
||||||
WITH_BF_BOOST = True
|
WITH_BF_BOOST = True
|
||||||
BF_BOOST = LIBDIR + '/boost'
|
BF_BOOST = LIBDIR + '/boost'
|
||||||
BF_BOOST_INC = BF_BOOST + '/include'
|
BF_BOOST_INC = '${BF_BOOST}/include'
|
||||||
BF_BOOST_LIB = 'boost_date_time-mt boost_filesystem-mt boost_regex-mt boost_system-mt boost_thread-mt'
|
BF_BOOST_LIB = 'boost_date_time-mt boost_filesystem-mt boost_regex-mt boost_system-mt boost_thread-mt'
|
||||||
BF_BOOST_LIB_INTERNATIONAL = 'boost_locale-mt'
|
BF_BOOST_LIB_INTERNATIONAL = 'boost_locale-mt'
|
||||||
BF_BOOST_LIBPATH = BF_BOOST + '/lib'
|
BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
|
||||||
|
|
||||||
WITH_BF_CYCLES_CUDA_BINARIES = False
|
WITH_BF_CYCLES_CUDA_BINARIES = False
|
||||||
BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
|
BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
|
||||||
|
@ -204,9 +204,9 @@ BF_OIIO = LIBDIR + '/oiio'
|
|||||||
if not os.path.exists(LCGDIR + '/oiio'):
|
if not os.path.exists(LCGDIR + '/oiio'):
|
||||||
WITH_BF_OIIO = False
|
WITH_BF_OIIO = False
|
||||||
BF_OIIO = '/usr'
|
BF_OIIO = '/usr'
|
||||||
BF_OIIO_INC = BF_OIIO + '/include'
|
BF_OIIO_INC = '${BF_OIIO}/include'
|
||||||
BF_OIIO_LIB = 'OpenImageIO'
|
BF_OIIO_LIB = 'OpenImageIO'
|
||||||
BF_OIIO_LIBPATH = BF_OIIO + '/lib'
|
BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
|
||||||
|
|
||||||
WITH_BF_OCIO = True
|
WITH_BF_OCIO = True
|
||||||
WITH_BF_STATICOCIO = False
|
WITH_BF_STATICOCIO = False
|
||||||
@ -214,9 +214,9 @@ BF_OCIO = LIBDIR + '/ocio'
|
|||||||
if not os.path.exists(LCGDIR + '/ocio'):
|
if not os.path.exists(LCGDIR + '/ocio'):
|
||||||
WITH_BF_OCIO = False
|
WITH_BF_OCIO = False
|
||||||
BF_OCIO = '/usr'
|
BF_OCIO = '/usr'
|
||||||
BF_OCIO_INC = BF_OCIO + '/include'
|
BF_OCIO_INC = '${BF_OCIO}/include'
|
||||||
BF_OCIO_LIB = 'OpenColorIO yaml-cpp tinyxml'
|
BF_OCIO_LIB = 'OpenColorIO yaml-cpp tinyxml'
|
||||||
BF_OCIO_LIBPATH = BF_OCIO + '/lib'
|
BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
|
||||||
|
|
||||||
WITH_BF_BOOST = True
|
WITH_BF_BOOST = True
|
||||||
WITH_BF_STATICBOOST = False
|
WITH_BF_STATICBOOST = False
|
||||||
@ -224,10 +224,10 @@ BF_BOOST = LIBDIR + '/boost'
|
|||||||
if not os.path.exists(LCGDIR + '/boost'):
|
if not os.path.exists(LCGDIR + '/boost'):
|
||||||
WITH_BF_BOOST = False
|
WITH_BF_BOOST = False
|
||||||
BF_BOOST = '/usr'
|
BF_BOOST = '/usr'
|
||||||
BF_BOOST_INC = BF_BOOST + '/include'
|
BF_BOOST_INC = '${BF_BOOST}/include'
|
||||||
BF_BOOST_LIB = 'boost_date_time boost_filesystem boost_regex boost_system boost_thread'
|
BF_BOOST_LIB = 'boost_date_time boost_filesystem boost_regex boost_system boost_thread'
|
||||||
BF_BOOST_LIB_INTERNATIONAL = 'boost_locale'
|
BF_BOOST_LIB_INTERNATIONAL = 'boost_locale'
|
||||||
BF_BOOST_LIBPATH = BF_BOOST + '/lib'
|
BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
|
||||||
|
|
||||||
WITH_BF_CYCLES = WITH_BF_OIIO and WITH_BF_BOOST
|
WITH_BF_CYCLES = WITH_BF_OIIO and WITH_BF_BOOST
|
||||||
|
|
||||||
|
@ -150,22 +150,22 @@ WITH_BF_CYCLES = True
|
|||||||
|
|
||||||
WITH_BF_OIIO = True
|
WITH_BF_OIIO = True
|
||||||
BF_OIIO = LIBDIR + '/openimageio'
|
BF_OIIO = LIBDIR + '/openimageio'
|
||||||
BF_OIIO_INC = BF_OIIO + '/include'
|
BF_OIIO_INC = '${BF_OIIO}/include'
|
||||||
BF_OIIO_LIB = 'OpenImageIO'
|
BF_OIIO_LIB = 'OpenImageIO'
|
||||||
BF_OIIO_LIBPATH = BF_OIIO + '/lib'
|
BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
|
||||||
|
|
||||||
WITH_BF_OCIO = True
|
WITH_BF_OCIO = True
|
||||||
BF_OCIO = LIBDIR + '/opencolorio'
|
BF_OCIO = LIBDIR + '/opencolorio'
|
||||||
BF_OCIO_INC = BF_OCIO + '/include'
|
BF_OCIO_INC = '${BF_OCIO}/include'
|
||||||
BF_OCIO_LIB = 'OpenColorIO'
|
BF_OCIO_LIB = 'OpenColorIO'
|
||||||
BF_OCIO_LIBPATH = BF_OCIO + '/lib'
|
BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
|
||||||
|
|
||||||
WITH_BF_BOOST = True
|
WITH_BF_BOOST = True
|
||||||
BF_BOOST = LIBDIR + '/boost'
|
BF_BOOST = LIBDIR + '/boost'
|
||||||
BF_BOOST_INC = BF_BOOST + '/include'
|
BF_BOOST_INC = '${BF_BOOST}/include'
|
||||||
BF_BOOST_LIB = 'boost_date_time-mgw46-mt-s-1_49 boost_filesystem-mgw46-mt-s-1_49 boost_regex-mgw46-mt-s-1_49 boost_system-mgw46-mt-s-1_49 boost_thread-mgw46-mt-s-1_49'
|
BF_BOOST_LIB = 'boost_date_time-mgw46-mt-s-1_49 boost_filesystem-mgw46-mt-s-1_49 boost_regex-mgw46-mt-s-1_49 boost_system-mgw46-mt-s-1_49 boost_thread-mgw46-mt-s-1_49'
|
||||||
BF_BOOST_LIB_INTERNATIONAL = 'boost_locale-mgw46-mt-s-1_49'
|
BF_BOOST_LIB_INTERNATIONAL = 'boost_locale-mgw46-mt-s-1_49'
|
||||||
BF_BOOST_LIBPATH = BF_BOOST + '/lib'
|
BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
|
||||||
|
|
||||||
#Ray trace optimization
|
#Ray trace optimization
|
||||||
WITH_BF_RAYOPTIMIZATION = True
|
WITH_BF_RAYOPTIMIZATION = True
|
||||||
|
@ -162,10 +162,10 @@ BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
|
|||||||
|
|
||||||
WITH_BF_BOOST = True
|
WITH_BF_BOOST = True
|
||||||
BF_BOOST = LIBDIR + '/boost'
|
BF_BOOST = LIBDIR + '/boost'
|
||||||
BF_BOOST_INC = BF_BOOST + '/include'
|
BF_BOOST_INC = '${BF_BOOST}/include'
|
||||||
BF_BOOST_LIB = 'boost_date_time-mgw47-mt-s-1_49 boost_date_time-mgw47-mt-sd-1_49 boost_filesystem-mgw47-mt-s-1_49 boost_filesystem-mgw47-mt-sd-1_49 boost_regex-mgw47-mt-s-1_49 boost_regex-mgw47-mt-sd-1_49 boost_system-mgw47-mt-s-1_49 boost_system-mgw47-mt-sd-1_49 boost_thread-mgw47-mt-s-1_49 boost_thread-mgw47-mt-sd-1_49'
|
BF_BOOST_LIB = 'boost_date_time-mgw47-mt-s-1_49 boost_date_time-mgw47-mt-sd-1_49 boost_filesystem-mgw47-mt-s-1_49 boost_filesystem-mgw47-mt-sd-1_49 boost_regex-mgw47-mt-s-1_49 boost_regex-mgw47-mt-sd-1_49 boost_system-mgw47-mt-s-1_49 boost_system-mgw47-mt-sd-1_49 boost_thread-mgw47-mt-s-1_49 boost_thread-mgw47-mt-sd-1_49'
|
||||||
BF_BOOST_LIB_INTERNATIONAL = ' boost_locale-mgw47-mt-s-1_49 boost_locale-mgw47-mt-sd-1_49'
|
BF_BOOST_LIB_INTERNATIONAL = ' boost_locale-mgw47-mt-s-1_49 boost_locale-mgw47-mt-sd-1_49'
|
||||||
BF_BOOST_LIBPATH = BF_BOOST + '/lib'
|
BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
|
||||||
|
|
||||||
#Ray trace optimization
|
#Ray trace optimization
|
||||||
WITH_BF_RAYOPTIMIZATION = True
|
WITH_BF_RAYOPTIMIZATION = True
|
||||||
|
Loading…
Reference in New Issue
Block a user