]> git.saurik.com Git - wxWidgets.git/commitdiff
Add COMPILER_VERSION to nmake command line
authorRobin Dunn <robin@alldunn.com>
Mon, 2 Jul 2012 02:58:58 +0000 (02:58 +0000)
committerRobin Dunn <robin@alldunn.com>
Mon, 2 Jul 2012 02:58:58 +0000 (02:58 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

build/tools/build-wxwidgets.py

index 06957958288d0c1bdbba0e763f70b1d4ce1f5d53..8218c87b0fb5c8e56c9c975da8ce4c5bd23496bd 100755 (executable)
@@ -58,6 +58,15 @@ def getXcodePath():
     return getoutput("xcode-select -print-path")
 
 
     return getoutput("xcode-select -print-path")
 
 
+def getVisCVersion():
+    text = getoutput("cl.exe")
+    if 'Version 15' in text:
+        return '90'
+    # TODO: Add more tests to get the other versions...
+    else:
+        return 'FIXME'
+    
+
 def exitIfError(code, msg):
     if code != 0:
         print(msg)
 def exitIfError(code, msg):
     if code != 0:
         print(msg)
@@ -402,6 +411,7 @@ def main(scriptName, args):
     
             if options.wxpython:
                 args.append("OFFICIAL_BUILD=1")
     
             if options.wxpython:
                 args.append("OFFICIAL_BUILD=1")
+                args.append("COMPILER_VERSION=%s" % getVisCVersion())
                 args.append("SHARED=1")
                 args.append("MONOLITHIC=0")
                 args.append("USE_OPENGL=1")
                 args.append("SHARED=1")
                 args.append("MONOLITHIC=0")
                 args.append("USE_OPENGL=1")