diff options
| author | Jürgen Herrmann <shadowrom@me.com> | 2013-06-24 09:45:03 +0400 |
|---|---|---|
| committer | Jürgen Herrmann <shadowrom@me.com> | 2013-06-24 09:45:03 +0400 |
| commit | 86bebb338013fd9ac4e39c3f3a8665b1d3b0ed53 (patch) | |
| tree | 6f46b260da6328b96f8e7e6d149d44c26dfeee6b /build_files/scons/config/win32-vc-config.py | |
| parent | bfd0ceb4e08ae925d197d399cd5416acfcbf685f (diff) | |
Fix for #35851:
- Make scons work for non western CL.exe.
Diffstat (limited to 'build_files/scons/config/win32-vc-config.py')
| -rw-r--r-- | build_files/scons/config/win32-vc-config.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py index b9ec5208d53..12ca16d480a 100644 --- a/build_files/scons/config/win32-vc-config.py +++ b/build_files/scons/config/win32-vc-config.py @@ -3,13 +3,13 @@ import subprocess CL_OUT = subprocess.Popen(["cl.exe"],stdout=subprocess.PIPE,stderr=subprocess.PIPE) CL_STDOUT, CL_STDERR = CL_OUT.communicate() -if CL_STDERR.find("Version 15.00.") == -1: - VC_VERSION = '11.0' - LCGDIR = '#../lib/windows_vc11' - -else: +if CL_STDERR.find("17.00.") == -1: VC_VERSION = '9.0' LCGDIR = '#../lib/windows' + +else: + VC_VERSION = '11.0' + LCGDIR = '#../lib/windows_vc11' LIBDIR = '${LCGDIR}' |