Scons / Cycles:
authorThomas Dinges <blender@dingto.org>
Thu, 24 Nov 2011 19:22:34 +0000 (19:22 +0000)
committerThomas Dinges <blender@dingto.org>
Thu, 24 Nov 2011 19:22:34 +0000 (19:22 +0000)
* Add dummy WITH_BF_CYCLES_BINARIES to scons, to be able to copy the .cubin kernels from cmake and have it work.

build_files/scons/tools/btools.py
intern/cycles/SConscript

index 4c826b12e89b850f094913d05cd57a5602b5efad..1ddbfcb96082332980b56f6195f3846e640e021d 100644 (file)
@@ -544,6 +544,7 @@ def read_opts(env, cfg, args):
 
     localopts.AddVariables(
         (BoolVariable('WITH_BF_CYCLES', 'Build with the Cycles engine', True)),
+        (BoolVariable('WITH_BF_CYCLES_BINARIES', 'Build with precompiled CUDA binaries', False)),
 
         (BoolVariable('WITH_BF_OIIO', 'Build with OpenImageIO', False)),
         (BoolVariable('WITH_BF_STATICOIIO', 'Staticly link to OpenImageIO', False)),
index 4d45a6875a97f097b0c5d1912a09fd7f88c5ead4..ecd22f654e8fc6030ebdac5bf9b9ac35c8d9fe22 100644 (file)
@@ -22,6 +22,9 @@ defs.append('WITH_OPENCL')
 defs.append('WITH_MULTI')
 defs.append('WITH_CUDA')
 
+if env['WITH_BF_CYCLES_BINARIES']:
+    defs.append('WITH_CUDA_BINARIES')
+
 incs.extend('. bvh render device kernel kernel/osl kernel/svm util subd'.split())
 incs.extend('#intern/guardedalloc #source/blender/makesrna #source/blender/makesdna'.split())
 incs.extend('#source/blender/blenloader ../../source/blender/makesrna/intern'.split())