diff options
author | Thomas Dinges <blender@dingto.org> | 2011-11-09 00:56:55 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2011-11-09 00:56:55 +0400 |
commit | a645935a1d8118e6c28b3a0ebdc338439e647c52 (patch) | |
tree | f2eba51c44ae1af717ac88b67173303a3272db88 /build_files/scons | |
parent | c9bca51e7646510913bace5374e0a948ddb7dfb7 (diff) |
Build system fixes:
* Fixed Boost libs names after upgrade to 1.47
* Remove old reference to space_sound from cmake.
Diffstat (limited to 'build_files/scons')
-rw-r--r-- | build_files/scons/config/win32-vc-config.py | 2 | ||||
-rw-r--r-- | build_files/scons/config/win64-vc-config.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py index 20d4cdbf797..ff01cdd7917 100644 --- a/build_files/scons/config/win32-vc-config.py +++ b/build_files/scons/config/win32-vc-config.py @@ -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 diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py index 051e4b0cc10..2e3856f9380 100644 --- a/build_files/scons/config/win64-vc-config.py +++ b/build_files/scons/config/win64-vc-config.py @@ -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 |