[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42136] trunk/blender: Scons / Cycles:

[Thomas Dinges]

Revision: 42136
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42136
Author:   dingto
Date:     2011-11-24 19:22:34 +0000 (Thu, 24 Nov 2011)
Log Message:
-----------
Scons / Cycles:
* Add dummy WITH_BF_CYCLES_BINARIES to scons, to be able to copy the .cubin kernels from cmake and have it work. 

Modified Paths:
--------------
    trunk/blender/build_files/scons/tools/btools.py
    trunk/blender/intern/cycles/SConscript

Modified: trunk/blender/build_files/scons/tools/btools.py
===================================================================
--- trunk/blender/build_files/scons/tools/btools.py	2011-11-24 18:17:57 UTC (rev 42135)
+++ trunk/blender/build_files/scons/tools/btools.py	2011-11-24 19:22:34 UTC (rev 42136)
@@ -544,6 +544,7 @@
 
     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)),

Modified: trunk/blender/intern/cycles/SConscript
===================================================================
--- trunk/blender/intern/cycles/SConscript	2011-11-24 18:17:57 UTC (rev 42135)
+++ trunk/blender/intern/cycles/SConscript	2011-11-24 19:22:34 UTC (rev 42136)
@@ -22,6 +22,9 @@
 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())