diff options
| author | Jürgen Herrmann <shadowrom@me.com> | 2013-06-18 15:55:32 +0400 |
|---|---|---|
| committer | Jürgen Herrmann <shadowrom@me.com> | 2013-06-18 15:55:32 +0400 |
| commit | 836b91c9c711b0ce3803f64b3123cdd4d1adc47d (patch) | |
| tree | 2553eef69e1e5369b65ad0dd4a74529c91a06fb0 /build_files/scons/tools/btools.py | |
| parent | c88ea1c4f895feee6163a0bf5d8541421d1c74e6 (diff) | |
Scons and BuildBot changes for MSVC 2012 support.
Thanks Brecht and Thomas for reviewing ;)
Diffstat (limited to 'build_files/scons/tools/btools.py')
| -rw-r--r-- | build_files/scons/tools/btools.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index 868d443f8bb..90674113f47 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -190,7 +190,7 @@ def validate_arguments(args, bc): 'BF_BSC', 'BF_CONFIG', 'BF_PRIORITYLIST', 'BF_BUILDINFO','CC', 'CXX', 'BF_QUICKDEBUG', 'BF_LISTDEBUG', 'LCGDIR', 'BF_X264_CONFIG', 'BF_XVIDCORE_CONFIG', - 'BF_UNIT_TEST', 'BF_BITNESS'] + 'BF_UNIT_TEST', 'BF_BITNESS', 'MSVS_VERSION'] okdict = {} @@ -687,6 +687,9 @@ def buildslave(target=None, source=None, env=None): if platform == 'darwin': platform = 'OSX-' + env['MACOSX_DEPLOYMENT_TARGET'] + '-' + env['MACOSX_ARCHITECTURE'] + if env['MSVC_VERSION'] == '11.0': + platform = env['OURPLATFORM'] + '11' + branch = env['BUILDBOT_BRANCH'] outdir = os.path.abspath(env['BF_INSTALLDIR']) |