[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41684] trunk/blender: Build system fixes:
Thomas Dinges
blender at dingto.org
Tue Nov 8 21:56:56 CET 2011
Revision: 41684
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41684
Author: dingto
Date: 2011-11-08 20:56:55 +0000 (Tue, 08 Nov 2011)
Log Message:
-----------
Build system fixes:
* Fixed Boost libs names after upgrade to 1.47
* Remove old reference to space_sound from cmake.
Modified Paths:
--------------
trunk/blender/build_files/scons/config/win32-vc-config.py
trunk/blender/build_files/scons/config/win64-vc-config.py
trunk/blender/source/creator/CMakeLists.txt
Modified: trunk/blender/build_files/scons/config/win32-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-vc-config.py 2011-11-08 20:40:27 UTC (rev 41683)
+++ trunk/blender/build_files/scons/config/win32-vc-config.py 2011-11-08 20:56:55 UTC (rev 41684)
@@ -161,7 +161,7 @@
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
Modified: trunk/blender/build_files/scons/config/win64-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win64-vc-config.py 2011-11-08 20:40:27 UTC (rev 41683)
+++ trunk/blender/build_files/scons/config/win64-vc-config.py 2011-11-08 20:56:55 UTC (rev 41684)
@@ -164,7 +164,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_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
Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt 2011-11-08 20:40:27 UTC (rev 41683)
+++ trunk/blender/source/creator/CMakeLists.txt 2011-11-08 20:56:55 UTC (rev 41684)
@@ -780,7 +780,6 @@
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
More information about the Bf-blender-cvs
mailing list