diff options
| author | Daniel Stokes <kupomail@gmail.com> | 2012-04-29 04:33:24 +0400 |
|---|---|---|
| committer | Daniel Stokes <kupomail@gmail.com> | 2012-04-29 04:33:24 +0400 |
| commit | afb8fffb1827a4fffc8e6b3d620a02f59b62e3a9 (patch) | |
| tree | 328e3c204210d68392805f371ef4d296175b6b6e /build_files/buildbot/slave_compile.py | |
| parent | f306b50700b05707f44b5472ac0b38d58fb01b0d (diff) | |
| parent | 72ec4c813a2c544341d0c4ae83369cea60e52c9e (diff) | |
Merged revisions 45967-46052 from trunk/blendersoc-2011-cucumber
Diffstat (limited to 'build_files/buildbot/slave_compile.py')
| -rw-r--r-- | build_files/buildbot/slave_compile.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 209253296be..eafdf0868cd 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -117,6 +117,8 @@ else: scons_options.append('BF_BITNESS=' + bitness) scons_options.append('WITH_BF_CYCLES_CUDA_BINARIES=True') scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe') + if builder.find('mingw') != -1: + scons_options.append('BF_TOOLSET=mingw') retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options) sys.exit(retcode) |