Adapt to new lib dirs, etc. in the Windows build

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

buildtools/config.py

@@ -155,9 +155,9 @@ class Configuration(object):
             self.WXPLAT = '__WXMSW__'
         
             if os.environ.get('CPU', None) == 'AMD64':
-                self.VCDLL = 'vc_amd64_dll'
+                self.VCDLL = 'vc%s_amd64_dll' % getVisCVersion()
             else:
-                self.VCDLL = 'vc_dll'
+                self.VCDLL = 'vc%s_dll' % getVisCVersion()
                 
             self.includes += ['include',
                               opj(self.WXDIR, 'lib', self.VCDLL, 'msw'  + self.libFlag()),
@@ -829,3 +829,11 @@ def getSipFiles(names):
             
 
     
+def getVisCVersion():
+    text = runcmd("cl.exe", getOutput=True)
+    if 'Version 15' in text:
+        return '90'
+    # TODO: Add more tests to get the other versions...
+    else:
+        return 'FIXME'
+