Build system fixes:
authorThomas Dinges <blender@dingto.org>
Tue, 8 Nov 2011 20:56:55 +0000 (20:56 +0000)
committerThomas Dinges <blender@dingto.org>
Tue, 8 Nov 2011 20:56:55 +0000 (20:56 +0000)
* Fixed Boost libs names after upgrade to 1.47
* Remove old reference to space_sound from cmake.

build_files/scons/config/win32-vc-config.py
build_files/scons/config/win64-vc-config.py
source/creator/CMakeLists.txt

index 20d4cdbf797eea47c3b6fcb655153c0e3d7b341e..ff01cdd7917d9fcb5134f14c5fc58e986884c344 100644 (file)
@@ -161,7 +161,7 @@ BF_OIIO_LIBPATH = '#../lib/windows/openimageio/lib'
 WITH_BF_BOOST = True
 BF_BOOST = LIBDIR + '/boost'
 BF_BOOST_INC = '#../lib/windows/boost/include'
-BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_46_1 libboost_filesystem-vc90-mt-s-1_46_1 libboost_regex-vc90-mt-s-1_46_1 libboost_system-vc90-mt-s-1_46_1 libboost_thread-vc90-mt-s-1_46_1'
+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_LIBPATH = '#../lib/windows/boost/lib'
 
 #Ray trace optimization
index 051e4b0cc103802b250f4f3994cf16b578dfab58..2e3856f9380aa64e189b7a830ab1d9f94d2f15ae 100644 (file)
@@ -164,7 +164,7 @@ BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
 WITH_BF_BOOST = True
 BF_BOOST = LIBDIR + '/boost'
 BF_BOOST_INC = '${BF_BOOST}/include'
-BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_45 libboost_filesystem-vc90-mt-s-1_45 libboost_regex-vc90-mt-s-1_45 libboost_system-vc90-mt-s-1_45 libboost_thread-vc90-mt-s-1_45'
+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_LIBPATH = '${BF_BOOST}/lib'
 
 #Ray trace optimization
index bb55d05cb280fd60ca8355406883003a3dfbd121..b86e9faf813bab161aef7fcc6c14518673b3b7f4 100644 (file)
@@ -780,7 +780,6 @@ endif()
                bf_editor_space_outliner
                bf_editor_space_script
                bf_editor_space_sequencer
-               bf_editor_space_sound
                bf_editor_space_time
                bf_editor_space_userpref
                bf_editor_space_view3d