diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2012-04-27 17:18:55 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2012-04-27 17:18:55 +0400 |
| commit | a299855e34ce4321b2e508646965403f56d6ddc5 (patch) | |
| tree | ff371a7ce5633440c6850588f1e5a48b83b3de73 | |
| parent | dbe68289f4c7c4b7064bb05f27457f76d54e2db8 (diff) | |
Changes to get mingw buildslaves going.
| -rw-r--r-- | build_files/buildbot/master.cfg | 2 | ||||
| -rw-r--r-- | build_files/buildbot/slave_compile.py | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg index 23751f7dcd4..066c133d335 100644 --- a/build_files/buildbot/master.cfg +++ b/build_files/buildbot/master.cfg @@ -117,6 +117,8 @@ add_builder(c, 'salad_linux_x86_64_scons', '', generic_builder, 'soc-2011-salad' add_builder(c, 'win32_scons', 'windows', generic_builder) add_builder(c, 'salad_win32_scons', 'windows', generic_builder, 'soc-2011-salad') add_builder(c, 'win64_scons', 'win64', generic_builder) +add_builder(c, 'mingw_win64_scons', 'mingw64', generic_builder) +add_builder(c, 'mingw_win32_scons', 'mingw32', generic_builder) #add_builder(c, 'freebsd_i386_cmake', '', generic_builder) #add_builder(c, 'freebsd_x86_64_cmake', '', generic_builder) 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) |