diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-12-01 20:33:21 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-12-01 20:33:21 +0400 |
| commit | 45de38077131b248eb52ab1863072750252a85e2 (patch) | |
| tree | ae04201f8c6600b65974d252075f0dd020423c20 /build_files/scons/config | |
| parent | f6f7e270e30946d0bb3ea4d5c556c994125e590f (diff) | |
Cycles
* Compile all of cycles with -ffast-math again
* Add scons compilation of cuda binaries, tested on mac/linux.
* Add UI option for supported/experimental features, to make it
more clear what is supported, opencl/subdivision is experimental.
* Remove cycles xml exporter, was just for testing.
Diffstat (limited to 'build_files/scons/config')
| -rw-r--r-- | build_files/scons/config/darwin-config.py | 6 | ||||
| -rw-r--r-- | build_files/scons/config/linux-config.py | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py index 028b1bd0289..e0b8822ce36 100644 --- a/build_files/scons/config/darwin-config.py +++ b/build_files/scons/config/darwin-config.py @@ -283,7 +283,7 @@ BF_PCRE_LIBPATH = '${BF_PCRE}/lib' #BF_EXPAT_LIB = 'expat' #BF_EXPAT_LIBPATH = '/usr/lib' -#Cycles +# Cycles WITH_BF_CYCLES = True WITH_BF_OIIO = True @@ -298,6 +298,10 @@ BF_BOOST_INC = BF_BOOST + '/include' BF_BOOST_LIB = 'boost_date_time-mt boost_filesystem-mt boost_regex-mt boost_system-mt boost_thread-mt' BF_BOOST_LIBPATH = BF_BOOST + '/lib' +WITH_BF_CYCLES_CUDA_BINARIES = False +BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc' +BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21'] + #Ray trace optimization if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'i386': WITH_BF_RAYOPTIMIZATION = True diff --git a/build_files/scons/config/linux-config.py b/build_files/scons/config/linux-config.py index b25bf98c9e6..6964ff993b6 100644 --- a/build_files/scons/config/linux-config.py +++ b/build_files/scons/config/linux-config.py @@ -219,6 +219,10 @@ BF_BOOST_LIBPATH = BF_BOOST + '/lib' WITH_BF_CYCLES = WITH_BF_OIIO and WITH_BF_BOOST +WITH_BF_CYCLES_CUDA_BINARIES = False +BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc' +BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21'] + WITH_BF_OPENMP = True #Ray trace optimization |