Fix for #35851:
authorJürgen Herrmann <shadowrom@me.com>
Mon, 24 Jun 2013 05:45:03 +0000 (05:45 +0000)
committerJürgen Herrmann <shadowrom@me.com>
Mon, 24 Jun 2013 05:45:03 +0000 (05:45 +0000)
- Make scons work for non western CL.exe.

build_files/scons/config/win32-vc-config.py
build_files/scons/config/win64-vc-config.py

index b9ec5208d5328715fcc932967f81abe96a2aecb7..12ca16d480ad84144bd308fdcef9503d2d3f3657 100644 (file)
@@ -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()
 
 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'
     VC_VERSION = '9.0'
     LCGDIR = '#../lib/windows'
+    
+else:
+    VC_VERSION = '11.0'
+    LCGDIR = '#../lib/windows_vc11'
 
 LIBDIR = '${LCGDIR}'
 
 
 LIBDIR = '${LCGDIR}'
 
index 803cac144aba919be10d7446b79739c51418d3ea..ab1c2a87d93234f7e557145b0c7a0358dd05c106 100644 (file)
@@ -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()
 
 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/win64_vc11'
-    
-else:
+if CL_STDERR.find("17.00.") == -1:
     VC_VERSION = '9.0'
     LCGDIR = '#../lib/win64'
     VC_VERSION = '9.0'
     LCGDIR = '#../lib/win64'
+    
+else:
+    VC_VERSION = '11.0'
+    LCGDIR = '#../lib/win64_vc11'
 
 LIBDIR = '${LCGDIR}'
 
 
 LIBDIR = '${LCGDIR}'