diff options
| author | Thomas Dinges <blender@dingto.org> | 2012-05-29 16:28:34 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2012-05-29 16:28:34 +0400 |
| commit | b1e8063d6999d2eaad62f52bb81ced0876d1aced (patch) | |
| tree | 072605a9624a362f9016248e6f62086335693229 /build_files/scons | |
| parent | 7a301579c8c45045dca8baecefa57ed593c0a2af (diff) | |
Cycles / CUDA:
* Windows department switches to CUDA Toolkit 4.2 :)
* Windows Buildbot uses that too now (thanks jesterKing)
* Re-enable sm_13 for x86, compiled again with current SVN and the new toolkit.
* All official builds for windows now come with sm_13, sm_20, sm_21 and sm_30 for the Kepler cards.
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 5d52f0e34b6..db30f453228 100644 --- a/build_files/scons/config/win32-vc-config.py +++ b/build_files/scons/config/win32-vc-config.py @@ -165,7 +165,7 @@ BF_BOOST_LIBPATH = '${BF_BOOST}/lib' #CUDA WITH_BF_CYCLES_CUDA_BINARIES = False #BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler -BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21'] # don't build sm_13 until the compile can fit in 32bit process again :) +BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30'] #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 9e36be42329..fe16278dd19 100644 --- a/build_files/scons/config/win64-vc-config.py +++ b/build_files/scons/config/win64-vc-config.py @@ -162,7 +162,7 @@ BF_BOOST_LIBPATH = '${BF_BOOST}/lib' #CUDA WITH_BF_CYCLES_CUDA_BINARIES = False #BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler -BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21'] +BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30'] #Ray trace optimization WITH_BF_RAYOPTIMIZATION = True |