diff options
Diffstat (limited to 'build_files/scons')
-rw-r--r-- | build_files/scons/config/win32-vc-config.py | 12 | ||||
-rw-r--r-- | build_files/scons/config/win64-vc-config.py | 12 | ||||
-rw-r--r-- | build_files/scons/tools/btools.py | 3 |
3 files changed, 15 insertions, 12 deletions
diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py index ff01cdd7917..0440093b41a 100644 --- a/build_files/scons/config/win32-vc-config.py +++ b/build_files/scons/config/win32-vc-config.py @@ -153,16 +153,16 @@ WITH_BF_OPENMP = True WITH_BF_CYCLES = True WITH_BF_OIIO = True -BF_OIIO = LIBDIR + '/openimageio' -BF_OIIO_INC = '#../lib/windows/openimageio/include' +BF_OIIO = '${LIBDIR}/openimageio' +BF_OIIO_INC = '${BF_OIIO}/include' BF_OIIO_LIB = 'OpenImageIO' -BF_OIIO_LIBPATH = '#../lib/windows/openimageio/lib' +BF_OIIO_LIBPATH = '${BF_OIIO}/lib' WITH_BF_BOOST = True -BF_BOOST = LIBDIR + '/boost' -BF_BOOST_INC = '#../lib/windows/boost/include' +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_LIBPATH = '#../lib/windows/boost/lib' +BF_BOOST_LIBPATH = '${BF_BOOST}/lib' #Ray trace optimization WITH_BF_RAYOPTIMIZATION = True diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py index d910bdc5ca6..8c2956666a9 100644 --- a/build_files/scons/config/win64-vc-config.py +++ b/build_files/scons/config/win64-vc-config.py @@ -156,17 +156,17 @@ WITH_BF_OPENMP = True WITH_BF_CYCLES = True WITH_BF_OIIO = True -BF_OIIO = LIBDIR + '/openimageio' -BF_OIIO_INC = '#../lib/win64/openimageio/include' +BF_OIIO = '${LIBDIR}/openimageio' +BF_OIIO_INC = '${BF_OIIO}/include' BF_OIIO_LIB = 'OpenImageIO' BF_OIIO_LIBPATH = '${BF_OIIO}/lib' -BF_OIIO_LIBPATH = '#../lib/win64/openimageio/lib' +BF_OIIO_LIBPATH = '${BF_OIIO}/lib' WITH_BF_BOOST = True -BF_BOOST = LIBDIR + '/boost' -BF_BOOST_INC = '#../lib/win64/boost/include' +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_LIBPATH = '#../lib/win64/boost/lib' +BF_BOOST_LIBPATH = '${BF_BOOST}/lib' #Ray trace optimization WITH_BF_RAYOPTIMIZATION = True diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index 6686b948631..b4b10ba0bfa 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -240,6 +240,7 @@ def read_opts(env, cfg, args): localopts = Variables.Variables(cfg, args) localopts.AddVariables( ('LCGDIR', 'location of cvs lib dir'), + ('LIBDIR', 'root dir of libs'), (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)), ('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_OIIO', 'Build with OpenImageIO', False)), + ('BF_OIIO', 'OIIO root path', ''), ('BF_OIIO_INC', 'OIIO include path', ''), ('BF_OIIO_LIB', 'OIIO library', ''), ('BF_OIIO_LIBPATH', 'OIIO library path', ''), (BoolVariable('WITH_BF_BOOST', 'Build with Boost', False)), + ('BF_BOOST', 'Boost root path', ''), ('BF_BOOST_INC', 'Boost include path', ''), ('BF_BOOST_LIB', 'Boost library', ''), ('BF_BOOST_LIBPATH', 'Boost library path', '') |