diff options
| author | Martijn Berger <martijn.berger@gmail.com> | 2014-05-18 17:36:46 +0400 |
|---|---|---|
| committer | Martijn Berger <martijn.berger@gmail.com> | 2014-05-18 17:36:46 +0400 |
| commit | 07e8096c63a35af3331aae7781643ca103dd1bdf (patch) | |
| tree | e2699aae30408d2794fa61206c9cf2dffd7d637c /build_files | |
| parent | a089a86edd720e8b2e00abfd18d4155cd70eb433 (diff) | |
Promote MSVC 2013 to be the official platform (without a numbered suffix) for scons
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/scons/config/win32-vc-config.py | 6 | ||||
| -rw-r--r-- | build_files/scons/config/win64-vc-config.py | 6 | ||||
| -rw-r--r-- | build_files/scons/tools/btools.py | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py index 876ea08ce04..524446d4b2e 100644 --- a/build_files/scons/config/win32-vc-config.py +++ b/build_files/scons/config/win32-vc-config.py @@ -255,8 +255,8 @@ BF_BSC=False 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' -else: BF_BUILDDIR = '..\\build\\win32-vc' BF_INSTALLDIR='..\\install\\win32-vc' +else: + BF_BUILDDIR = '..\\build\\win32-vc9' + BF_INSTALLDIR='..\\install\\win32-vc9' diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py index e09aadf4873..a45c0b1d3b6 100644 --- a/build_files/scons/config/win64-vc-config.py +++ b/build_files/scons/config/win64-vc-config.py @@ -256,8 +256,8 @@ 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' -else: BF_BUILDDIR = '..\\build\\win64-vc' BF_INSTALLDIR='..\\install\\win64-vc' +else: + BF_BUILDDIR = '..\\build\\win64-vc9' + BF_INSTALLDIR='..\\install\\win64-vc9' diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index 6b0ce4ed99c..64c56f03a32 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -680,8 +680,8 @@ def buildslave(target=None, source=None, env=None): if platform == 'darwin': platform = 'OSX-' + env['MACOSX_DEPLOYMENT_TARGET'] + '-' + env['MACOSX_ARCHITECTURE'] - if env['MSVC_VERSION'] == '12.0': - platform = env['OURPLATFORM'] + '12' + if env['MSVC_VERSION'] == '9.0': + platform = env['OURPLATFORM'] + '9' branch = env['BUILDBOT_BRANCH'] |