sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix ${} var usage. Was missing BF_OIIO and BF_BOOST init.

Browse Source 
Noticed still missing: OSX file copying (cycles .py files, kernel files, licenses).
This commit is contained in:
Nathan Letwory 2011-11-09 17:22:55 +00:00
parent 1ff2018842
commit f0adbb7746
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build_files/scons/config/win32-vc-config.py
View File

@ -153,16 +153,16 @@ WITH_BF_OPENMP = True
WITH_BF_CYCLES = True WITH_BF_CYCLES = True
WITH_BF_OIIO = True WITH_BF_OIIO = True
BF_OIIO = LIBDIR + '/openimageio' BF_OIIO = '${LIBDIR}/openimageio'
BF_OIIO_INC = '#../lib/windows/openimageio/include' BF_OIIO_INC = '${BF_OIIO}/include'
BF_OIIO_LIB = 'OpenImageIO' BF_OIIO_LIB = 'OpenImageIO'
BF_OIIO_LIBPATH = '#../lib/windows/openimageio/lib' BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
WITH_BF_BOOST = True WITH_BF_BOOST = True
BF_BOOST = LIBDIR + '/boost' BF_BOOST = '${LIBDIR}/boost'
BF_BOOST_INC = '#../lib/windows/boost/include' 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_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' BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
#Ray trace optimization #Ray trace optimization
WITH_BF_RAYOPTIMIZATION = True WITH_BF_RAYOPTIMIZATION = True

12
build_files/scons/config/win64-vc-config.py
View File

@ -156,17 +156,17 @@ WITH_BF_OPENMP = True
WITH_BF_CYCLES = True WITH_BF_CYCLES = True
WITH_BF_OIIO = True WITH_BF_OIIO = True
BF_OIIO = LIBDIR + '/openimageio' BF_OIIO = '${LIBDIR}/openimageio'
BF_OIIO_INC = '#../lib/win64/openimageio/include' BF_OIIO_INC = '${BF_OIIO}/include'
BF_OIIO_LIB = 'OpenImageIO' BF_OIIO_LIB = 'OpenImageIO'
BF_OIIO_LIBPATH = '${BF_OIIO}/lib' BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
BF_OIIO_LIBPATH = '#../lib/win64/openimageio/lib' BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
WITH_BF_BOOST = True WITH_BF_BOOST = True
BF_BOOST = LIBDIR + '/boost' BF_BOOST = '${LIBDIR}/boost'
BF_BOOST_INC = '#../lib/win64/boost/include' 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_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/win64/boost/lib' BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
#Ray trace optimization #Ray trace optimization
WITH_BF_RAYOPTIMIZATION = True WITH_BF_RAYOPTIMIZATION = True

3
build_files/scons/tools/btools.py
View File

@ -240,6 +240,7 @@ def read_opts(env, cfg, args):
localopts = Variables.Variables(cfg, args) localopts = Variables.Variables(cfg, args)
localopts.AddVariables( localopts.AddVariables(
('LCGDIR', 'location of cvs lib dir'), ('LCGDIR', 'location of cvs lib dir'),
('LIBDIR', 'root dir of libs'),
(BoolVariable('WITH_BF_PYTHON', 'Compile with python', True)), (BoolVariable('WITH_BF_PYTHON', 'Compile with python', True)),
(BoolVariable('WITH_BF_PYTHON_SAFETY', 'Internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency)', False)), (BoolVariable('WITH_BF_PYTHON_SAFETY', 'Internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency)', False)),
('BF_PYTHON', 'Base path for python', ''), ('BF_PYTHON', 'Base path for python', ''),
@ -541,11 +542,13 @@ def read_opts(env, cfg, args):
(BoolVariable('WITH_BF_CYCLES', 'Build with the Cycles engine', True)), (BoolVariable('WITH_BF_CYCLES', 'Build with the Cycles engine', True)),
(BoolVariable('WITH_BF_OIIO', 'Build with OpenImageIO', False)), (BoolVariable('WITH_BF_OIIO', 'Build with OpenImageIO', False)),
('BF_OIIO', 'OIIO root path', ''),
('BF_OIIO_INC', 'OIIO include path', ''), ('BF_OIIO_INC', 'OIIO include path', ''),
('BF_OIIO_LIB', 'OIIO library', ''), ('BF_OIIO_LIB', 'OIIO library', ''),
('BF_OIIO_LIBPATH', 'OIIO library path', ''), ('BF_OIIO_LIBPATH', 'OIIO library path', ''),
(BoolVariable('WITH_BF_BOOST', 'Build with Boost', False)), (BoolVariable('WITH_BF_BOOST', 'Build with Boost', False)),
('BF_BOOST', 'Boost root path', ''),
('BF_BOOST_INC', 'Boost include path', ''), ('BF_BOOST_INC', 'Boost include path', ''),
('BF_BOOST_LIB', 'Boost library', ''), ('BF_BOOST_LIB', 'Boost library', ''),
('BF_BOOST_LIBPATH', 'Boost library path', '') ('BF_BOOST_LIBPATH', 'Boost library path', '')