diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-02-08 15:10:16 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-02-08 15:10:16 +0300 |
| commit | d4913af84660318047e3404f9766014cd78864ab (patch) | |
| tree | 216516057dc8df5177e4f179392de5a79811ba3f /build_files | |
| parent | c973e8d2da5cf3f615256269128a07390f8c06a9 (diff) | |
| parent | 8cda364d6f2e6e8da454034f19fb959739045813 (diff) | |
Merge branch 'master' into blender2.8
# Conflicts:
# source/blender/blenloader/intern/writefile.c
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/buildbot/slave_compile.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 76d538ad578..860dd1174cf 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -72,10 +72,8 @@ if 'cmake' in builder: # Set up OSX architecture if builder.endswith('x86_64_10_6_cmake'): cmake_extra_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=x86_64') - cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda8-hack/bin/nvcc') cmake_extra_options.append('-DWITH_CODEC_QUICKTIME=OFF') cmake_extra_options.append('-DCMAKE_OSX_DEPLOYMENT_TARGET=10.6') - build_cubins = False elif builder.startswith('win'): |