diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-05-07 22:32:37 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-05-07 22:32:37 +0400 |
| commit | 13c0ef139fa2c571b14fe2d10a73c8b1a0eb1bd0 (patch) | |
| tree | 346c6703224ef7f0426ac17a03a333f0362861e8 /build_files | |
| parent | aa959b4e7d6d44df35c1efc990e5e4bd0c541e1d (diff) | |
Fix OS X 32 bit build error, and bring buildbot config in sync with default.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/buildbot/config/user-config-mac-i386.py | 3 | ||||
| -rw-r--r-- | build_files/buildbot/config/user-config-mac-x86_64.py | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/build_files/buildbot/config/user-config-mac-i386.py b/build_files/buildbot/config/user-config-mac-i386.py index e39b13039c5..e7b1b688100 100644 --- a/build_files/buildbot/config/user-config-mac-i386.py +++ b/build_files/buildbot/config/user-config-mac-i386.py @@ -317,6 +317,9 @@ WITH_BF_CYCLES_CUDA_BINARIES = True BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc' BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30'] +#Freestyle +WITH_BF_FREESTYLE = True + #Ray trace optimization if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'i386': WITH_BF_RAYOPTIMIZATION = True diff --git a/build_files/buildbot/config/user-config-mac-x86_64.py b/build_files/buildbot/config/user-config-mac-x86_64.py index 0331bdf3ab2..f5f6bf84796 100644 --- a/build_files/buildbot/config/user-config-mac-x86_64.py +++ b/build_files/buildbot/config/user-config-mac-x86_64.py @@ -317,6 +317,9 @@ WITH_BF_CYCLES_CUDA_BINARIES = True BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc' BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30'] +#Freestyle +WITH_BF_FREESTYLE = True + #Ray trace optimization if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'i386': WITH_BF_RAYOPTIMIZATION = True |