Cycles / Boost:
authorThomas Dinges <blender@dingto.org>
Sat, 30 Jun 2012 18:20:14 +0000 (18:20 +0000)
committerThomas Dinges <blender@dingto.org>
Sat, 30 Jun 2012 18:20:14 +0000 (18:20 +0000)
* Windows (msvc 2008) is now using Boost 1.49

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

index 6b0c4338567503f8f72763af48fb526cddf9c53b..609ee867eec6d981e189afc8b076f500280cfc2c 100644 (file)
@@ -159,7 +159,7 @@ BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
 WITH_BF_BOOST = True
 BF_BOOST = '${LIBDIR}/boost'
 BF_BOOST_INC = '${BF_BOOST}/include'
 WITH_BF_BOOST = True
 BF_BOOST = '${LIBDIR}/boost'
 BF_BOOST_INC = '${BF_BOOST}/include'
-BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_47 libboost_filesystem-vc90-mt-s-1_47 libboost_regex-vc90-mt-s-1_47 libboost_system-vc90-mt-s-1_47 libboost_thread-vc90-mt-s-1_47'
+BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_49 libboost_filesystem-vc90-mt-s-1_49 libboost_regex-vc90-mt-s-1_49 libboost_system-vc90-mt-s-1_49 libboost_thread-vc90-mt-s-1_49'
 BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
 
 #CUDA
 BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
 
 #CUDA
index 1f873360a3bd8e30509a7b49357a45b595f75e8e..681e058f5bec41bb6d371b03d18684d44ddad396 100644 (file)
@@ -156,7 +156,7 @@ BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
 WITH_BF_BOOST = True
 BF_BOOST = '${LIBDIR}/boost'
 BF_BOOST_INC = '${BF_BOOST}/include'
 WITH_BF_BOOST = True
 BF_BOOST = '${LIBDIR}/boost'
 BF_BOOST_INC = '${BF_BOOST}/include'
-BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_47 libboost_filesystem-vc90-mt-s-1_47 libboost_regex-vc90-mt-s-1_47 libboost_system-vc90-mt-s-1_47 libboost_thread-vc90-mt-s-1_47'
+BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_49 libboost_filesystem-vc90-mt-s-1_49 libboost_regex-vc90-mt-s-1_49 libboost_system-vc90-mt-s-1_49 libboost_thread-vc90-mt-s-1_49'
 BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
 
 #CUDA
 BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
 
 #CUDA