[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42389] trunk/blender/build_files/scons/ config: CUDA

[Thomas Dinges]

Revision: 42389
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42389
Author:   dingto
Date:     2011-12-04 10:45:25 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
CUDA
* Added CUDA Binaries to Windows scons config files, disabled by default. 
Also the path to nvcc is commented out, best to set this in the user config, as it varies on each system probably. 

Modified Paths:
--------------
    trunk/blender/build_files/scons/config/win32-vc-config.py
    trunk/blender/build_files/scons/config/win64-vc-config.py

Modified: trunk/blender/build_files/scons/config/win32-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-vc-config.py	2011-12-04 06:55:32 UTC (rev 42388)
+++ trunk/blender/build_files/scons/config/win32-vc-config.py	2011-12-04 10:45:25 UTC (rev 42389)
@@ -165,6 +165,11 @@
 BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_47 libboost_filesystem-vc90-mt-s-1_47 libboost_regex-vc90-mt-s-1_47 libboost_system-vc90-mt-s-1_47 libboost_thread-vc90-mt-s-1_47'
 BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
 
+#CUDA
+WITH_BF_CYCLES_CUDA_BINARIES = False
+#BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21']
+
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE']

Modified: trunk/blender/build_files/scons/config/win64-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win64-vc-config.py	2011-12-04 06:55:32 UTC (rev 42388)
+++ trunk/blender/build_files/scons/config/win64-vc-config.py	2011-12-04 10:45:25 UTC (rev 42389)
@@ -154,6 +154,7 @@
 
 WITH_BF_OPENMP = True
 
+#Cycles
 WITH_BF_CYCLES = True
 
 WITH_BF_OIIO = True
@@ -169,6 +170,11 @@
 BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_47 libboost_filesystem-vc90-mt-s-1_47 libboost_regex-vc90-mt-s-1_47 libboost_system-vc90-mt-s-1_47 libboost_thread-vc90-mt-s-1_47'
 BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
 
+#CUDA
+WITH_BF_CYCLES_CUDA_BINARIES = False
+#BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21']
+
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE','/arch:SSE2']