diff options
author | Thomas Dinges <blender@dingto.org> | 2011-12-04 14:45:25 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2011-12-04 14:45:25 +0400 |
commit | 12326ac6c554d97fbd38cf954ee7805e3205faad (patch) | |
tree | cb8317a03a9bf6cb20af025849f85695527aae25 | |
parent | 4c93e0ada3717a202420a79e1259d78b8a8bf318 (diff) |
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.
-rw-r--r-- | build_files/scons/config/win32-vc-config.py | 5 | ||||
-rw-r--r-- | build_files/scons/config/win64-vc-config.py | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py index 7295a16c4bc..a2e3d11c244 100644 --- a/build_files/scons/config/win32-vc-config.py +++ b/build_files/scons/config/win32-vc-config.py @@ -165,6 +165,11 @@ BF_BOOST_INC = '${BF_BOOST}/include' 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'] diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py index eb04d9f6403..74a526a59f7 100644 --- a/build_files/scons/config/win64-vc-config.py +++ b/build_files/scons/config/win64-vc-config.py @@ -154,6 +154,7 @@ WITH_BF_3DMOUSE = True WITH_BF_OPENMP = True +#Cycles WITH_BF_CYCLES = True WITH_BF_OIIO = True @@ -169,6 +170,11 @@ BF_BOOST_INC = '${BF_BOOST}/include' 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'] |