diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-09-25 16:56:34 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-09-25 16:57:43 +0300 |
| commit | 98ba302f7053b9bebc3854d0d05bdcaa55b6afc7 (patch) | |
| tree | 5109e87cb6950fe45ba09e4d1f1040f9f3a978d3 /build_files/buildbot | |
| parent | 76444a13c36c843de74256a131642276f9d4ab80 (diff) | |
| parent | 675cef0a165ad535546f24faf9d0ac474f704e64 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files/buildbot')
| -rw-r--r-- | build_files/buildbot/slave_compile.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index d99e66f7871..84f924b2dd9 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -72,7 +72,6 @@ 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('-DWITH_CODEC_QUICKTIME=OFF') cmake_extra_options.append('-DCMAKE_OSX_DEPLOYMENT_TARGET=10.6') cmake_extra_options.append('-DCUDA_HOST_COMPILER=/usr/local/cuda-hack/clang') cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/nvcc') |