kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Promote MSVC 2013 to be the official platform (without a numbered suffix) for scons

Browse Source
This commit is contained in:
Martijn Berger 2014-05-18 15:36:46 +02:00
parent a089a86edd
commit 07e8096c63
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build_files/scons/config/win32-vc-config.py
View File

@ -255,8 +255,8 @@ BF_BSC=False
if VC_VERSION == '12.0': if VC_VERSION == '12.0':
BF_CYCLES_CUDA_ENV="C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" 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_BUILDDIR = '..\\build\\win32-vc'
BF_INSTALLDIR='..\\install\\win32-vc' BF_INSTALLDIR='..\\install\\win32-vc'
else:
BF_BUILDDIR = '..\\build\\win32-vc9'
BF_INSTALLDIR='..\\install\\win32-vc9'

6
build_files/scons/config/win64-vc-config.py
View File

@ -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'] 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': if VC_VERSION == '12.0':
BF_CYCLES_CUDA_ENV="C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" 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_BUILDDIR = '..\\build\\win64-vc'
BF_INSTALLDIR='..\\install\\win64-vc' BF_INSTALLDIR='..\\install\\win64-vc'
else:
BF_BUILDDIR = '..\\build\\win64-vc9'
BF_INSTALLDIR='..\\install\\win64-vc9'

4
build_files/scons/tools/btools.py
View File

@ -680,8 +680,8 @@ def buildslave(target=None, source=None, env=None):
if platform == 'darwin': if platform == 'darwin':
platform = 'OSX-' + env['MACOSX_DEPLOYMENT_TARGET'] + '-' + env['MACOSX_ARCHITECTURE'] platform = 'OSX-' + env['MACOSX_DEPLOYMENT_TARGET'] + '-' + env['MACOSX_ARCHITECTURE']
if env['MSVC_VERSION'] == '12.0': if env['MSVC_VERSION'] == '9.0':
platform = env['OURPLATFORM'] + '12' platform = env['OURPLATFORM'] + '9'
branch = env['BUILDBOT_BRANCH'] branch = env['BUILDBOT_BRANCH']