It would be better to merge trunk to sushi, rather than applying changes manually.
Am 04.07.2012 20:09, schrieb Alexander Pinzon: > Revision: 48606 > > http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48606 > Author: apinzonf > Date: 2012-07-04 18:09:52 +0000 (Wed, 04 Jul 2012) > Log Message: > ----------- > Windows is now using Boost 1.49 - Updated Scons config files. > > Modified Paths: > -------------- > branches/soc-2012-sushi/build_files/scons/config/win32-vc-config.py > branches/soc-2012-sushi/build_files/scons/config/win64-vc-config.py > > Modified: branches/soc-2012-sushi/build_files/scons/config/win32-vc-config.py > =================================================================== > --- branches/soc-2012-sushi/build_files/scons/config/win32-vc-config.py > 2012-07-04 17:55:30 UTC (rev 48605) > +++ branches/soc-2012-sushi/build_files/scons/config/win32-vc-config.py > 2012-07-04 18:09:52 UTC (rev 48606) > @@ -159,7 +159,7 @@ > 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 > > Modified: branches/soc-2012-sushi/build_files/scons/config/win64-vc-config.py > =================================================================== > --- branches/soc-2012-sushi/build_files/scons/config/win64-vc-config.py > 2012-07-04 17:55:30 UTC (rev 48605) > +++ branches/soc-2012-sushi/build_files/scons/config/win64-vc-config.py > 2012-07-04 18:09:52 UTC (rev 48606) > @@ -156,7 +156,7 @@ > 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-blender-cvs mailing list > [email protected] > http://lists.blender.org/mailman/listinfo/bf-blender-cvs -- Thomas Dinges Blender Developer, Artist and Musician www.dingto.org _______________________________________________ Bf-committers mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-committers
