diff options
| author | Jürgen Herrmann <shadowrom@me.com> | 2013-06-18 15:55:32 +0400 |
|---|---|---|
| committer | Jürgen Herrmann <shadowrom@me.com> | 2013-06-18 15:55:32 +0400 |
| commit | 836b91c9c711b0ce3803f64b3123cdd4d1adc47d (patch) | |
| tree | 2553eef69e1e5369b65ad0dd4a74529c91a06fb0 /build_files/buildbot/slave_pack.py | |
| parent | c88ea1c4f895feee6163a0bf5d8541421d1c74e6 (diff) | |
Scons and BuildBot changes for MSVC 2012 support.
Thanks Brecht and Thomas for reviewing ;)
Diffstat (limited to 'build_files/buildbot/slave_pack.py')
| -rw-r--r-- | build_files/buildbot/slave_pack.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index 3c2569e4a69..3e8ae939dd5 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -99,6 +99,8 @@ if builder.find('scons') != -1: scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe') if builder.find('mingw') != -1: scons_options.append('BF_TOOLSET=mingw') + if builder.endswith('vc2012'): + scons_options.append('MSVS_VERSION=11.0') elif builder.find('mac') != -1: if builder.find('x86_64') != -1: |