[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57687] trunk/blender/build_files/scons/ config: Fix for #35851:

[Juergen Herrmann]

Revision: 57687
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57687
Author:   shadowrom
Date:     2013-06-24 05:45:03 +0000 (Mon, 24 Jun 2013)
Log Message:
-----------
Fix for #35851:

- Make scons work for non western CL.exe.

Modified Paths:
--------------
    trunk/blender/build_files/scons/config/win32-vc-config.py
    trunk/blender/build_files/scons/config/win64-vc-config.py

Modified: trunk/blender/build_files/scons/config/win32-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-vc-config.py	2013-06-24 05:26:42 UTC (rev 57686)
+++ trunk/blender/build_files/scons/config/win32-vc-config.py	2013-06-24 05:45:03 UTC (rev 57687)
@@ -3,13 +3,13 @@
 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:
+if CL_STDERR.find("17.00.") == -1:
+    VC_VERSION = '9.0'
+    LCGDIR = '#../lib/windows'
+    
+else:
     VC_VERSION = '11.0'
     LCGDIR = '#../lib/windows_vc11'
-    
-else:
-    VC_VERSION = '9.0'
-    LCGDIR = '#../lib/windows'
 
 LIBDIR = '${LCGDIR}'
 

Modified: trunk/blender/build_files/scons/config/win64-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win64-vc-config.py	2013-06-24 05:26:42 UTC (rev 57686)
+++ trunk/blender/build_files/scons/config/win64-vc-config.py	2013-06-24 05:45:03 UTC (rev 57687)
@@ -3,13 +3,13 @@
 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:
+if CL_STDERR.find("17.00.") == -1:
+    VC_VERSION = '9.0'
+    LCGDIR = '#../lib/win64'
+    
+else:
     VC_VERSION = '11.0'
     LCGDIR = '#../lib/win64_vc11'
-    
-else:
-    VC_VERSION = '9.0'
-    LCGDIR = '#../lib/win64'
 
 LIBDIR = '${LCGDIR}'