diff options
| author | Martijn Berger <martijn.berger@gmail.com> | 2014-02-19 02:15:40 +0400 |
|---|---|---|
| committer | Martijn Berger <martijn.berger@gmail.com> | 2014-02-19 02:15:40 +0400 |
| commit | ace071f99eba5a0d51ed05ae01a3e42499ffc02b (patch) | |
| tree | cfc5b5a5a81a9e4e2999a835dab19daeb27603b8 /build_files | |
| parent | 16987f1c3919b509ac0913471afdb68d3b9136e8 (diff) | |
prepare 32bit build msvc2013 scons/buildbot
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/scons/config/win32-vc-config.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py index 90a02820f8c..86360c0728f 100644 --- a/build_files/scons/config/win32-vc-config.py +++ b/build_files/scons/config/win32-vc-config.py @@ -272,7 +272,11 @@ PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:IX86','/STACK:2097152','/IN BF_BSC=False -if VC_VERSION == '11.0': +if VC_VERSION == '12.0': + BF_CYCLES_CUDA_ENV="C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" + BF_BUILDDIR = '..\\build\\win32-vc12' + BF_INSTALLDIR='..\\install\\win32-vc12' +elif VC_VERSION == '11.0': BF_BUILDDIR = '..\\build\\win32-vc11' BF_INSTALLDIR='..\\install\\win32-vc11' else: |