diff options
| author | Martijn Berger <martijn.berger@gmail.com> | 2013-12-29 17:42:02 +0400 |
|---|---|---|
| committer | Martijn Berger <martijn.berger@gmail.com> | 2013-12-29 17:57:21 +0400 |
| commit | 21d587d9fc055f568f7e0a81b58d703de7a2a1af (patch) | |
| tree | 0c12b453ddf60849b922493bcd51cbe173918251 /build_files/scons/config | |
| parent | 42aa19088e02e296b4cc19b7171de2840e111539 (diff) | |
Added option to have a seperate environment for executing nvcc
This can be used to compiler cuda kernels with Visual Studio 2010 while
the rest of blender is compiled with MSVC 12.0 / 2013
Diffstat (limited to 'build_files/scons/config')
| -rw-r--r-- | build_files/scons/config/win64-vc-config.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py index 2f757afee54..10994d3843c 100644 --- a/build_files/scons/config/win64-vc-config.py +++ b/build_files/scons/config/win64-vc-config.py @@ -264,6 +264,7 @@ LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32', 'comdlg32', PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/STACK:2097152','/OPT:NOREF','/INCREMENTAL:NO', '/NODEFAULTLIB:msvcrt.lib', '/NODEFAULTLIB:msvcmrt.lib', '/NODEFAULTLIB:msvcurt.lib', '/NODEFAULTLIB:msvcrtd.lib'] if VC_VERSION == '12.0': + BF_CYCLES_CUDA_ENV="C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" BF_BUILDDIR = '..\\build\\win64-vc12' BF_INSTALLDIR='..\\install\\win64-vc12' elif VC_VERSION == '11.0': |