diff options
Diffstat (limited to 'build_files/scons')
-rw-r--r-- | build_files/scons/config/win32-vc-config.py | 13 | ||||
-rw-r--r-- | build_files/scons/config/win64-vc-config.py | 4 | ||||
-rw-r--r-- | build_files/scons/tools/Blender.py | 5 | ||||
-rw-r--r-- | build_files/scons/tools/btools.py | 3 |
4 files changed, 17 insertions, 8 deletions
diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py index 1e4821180d6..20d4cdbf797 100644 --- a/build_files/scons/config/win32-vc-config.py +++ b/build_files/scons/config/win32-vc-config.py @@ -149,19 +149,20 @@ WITH_BF_3DMOUSE = True WITH_BF_OPENMP = True -''' +#Cycles +WITH_BF_CYCLES = True + WITH_BF_OIIO = True BF_OIIO = LIBDIR + '/openimageio' -BF_OIIO_INC = '${BF_OIIO}/include' +BF_OIIO_INC = '#../lib/windows/openimageio/include' BF_OIIO_LIB = 'OpenImageIO' -BF_OIIO_LIBPATH = '${BF_OIIO}/lib' +BF_OIIO_LIBPATH = '#../lib/windows/openimageio/lib' WITH_BF_BOOST = True BF_BOOST = LIBDIR + '/boost' -BF_BOOST_INC = '${BF_BOOST}/include' +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_LIBPATH = '${BF_BOOST}/lib' -''' +BF_BOOST_LIBPATH = '#../lib/windows/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 0920d9375ae..051e4b0cc10 100644 --- a/build_files/scons/config/win64-vc-config.py +++ b/build_files/scons/config/win64-vc-config.py @@ -153,7 +153,8 @@ WITH_BF_3DMOUSE = True WITH_BF_OPENMP = True -''' +WITH_BF_CYCLES = True + WITH_BF_OIIO = True BF_OIIO = LIBDIR + '/openimageio' BF_OIIO_INC = '${BF_OIIO}/include' @@ -165,7 +166,6 @@ 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_LIBPATH = '${BF_BOOST}/lib' -''' #Ray trace optimization WITH_BF_RAYOPTIMIZATION = True diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index ba15f1c1c09..ceadd031393 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -279,6 +279,11 @@ def setup_syslibs(lenv): if lenv['WITH_BF_3DMOUSE']: if not lenv['WITH_BF_STATIC3DMOUSE']: syslibs += Split(lenv['BF_3DMOUSE_LIB']) + + if lenv['WITH_BF_OIIO']: + syslibs += Split(lenv['BF_OIIO_LIB']) + if lenv['WITH_BF_BOOST']: + syslibs += Split(lenv['BF_BOOST_LIB']) if lenv['WITH_BF_OIIO']: syslibs += Split(lenv['BF_OIIO_LIB']) diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index 5c78dc646bb..6686b948631 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -156,6 +156,7 @@ def validate_arguments(args, bc): 'WITH_BF_JEMALLOC', 'WITH_BF_STATICJEMALLOC', 'BF_JEMALLOC', 'BF_JEMALLOC_INC', 'BF_JEMALLOC_LIBPATH', 'BF_JEMALLOC_LIB', 'BF_JEMALLOC_LIB_STATIC', 'BUILDBOT_BRANCH', 'WITH_BF_3DMOUSE', 'WITH_BF_STATIC3DMOUSE', 'BF_3DMOUSE', 'BF_3DMOUSE_INC', 'BF_3DMOUSE_LIB', 'BF_3DMOUSE_LIBPATH', 'BF_3DMOUSE_LIB_STATIC', + 'WITH_BF_CYCLES', 'WITH_BF_OIIO', 'BF_OIIO', 'BF_OIIO_INC', 'BF_OIIO_LIB', 'BF_OIIO_LIBPATH', 'WITH_BF_BOOST', 'BF_BOOST', 'BF_BOOST_INC', 'BF_BOOST_LIB', 'BF_BOOST_LIBPATH' ] @@ -537,6 +538,8 @@ def read_opts(env, cfg, args): ('BUILDBOT_BRANCH', 'Buildbot branch name', ''), + (BoolVariable('WITH_BF_CYCLES', 'Build with the Cycles engine', True)), + (BoolVariable('WITH_BF_OIIO', 'Build with OpenImageIO', False)), ('BF_OIIO_INC', 'OIIO include path', ''), ('BF_OIIO_LIB', 'OIIO library', ''), |