Changes to get mingw buildslaves going.
authorNathan Letwory <nathan@letworyinteractive.com>
Fri, 27 Apr 2012 13:18:55 +0000 (13:18 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Fri, 27 Apr 2012 13:18:55 +0000 (13:18 +0000)
build_files/buildbot/master.cfg
build_files/buildbot/slave_compile.py

index 23751f7dcd49a6a072c58a70fac979580cb2d791..066c133d3357d085ab95926d3e21a59f0ec5f1a6 100644 (file)
@@ -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)
 
index 209253296be04903d4106b7902ea5803ccedfcaa..eafdf0868cd4a10951864d31742705440de4638d 100644 (file)
@@ -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)