X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/119d50a82f08c0a0cf2bfd9e8cd9d9c20a03275f..9e1da4827a0ec18f9766d664b9af12c25e3f71fb:/build/tools/build-wxwidgets.py?ds=inline

diff --git a/build/tools/build-wxwidgets.py b/build/tools/build-wxwidgets.py
index 0695795828..3c5bf07e5c 100755
--- a/build/tools/build-wxwidgets.py
+++ b/build/tools/build-wxwidgets.py
@@ -58,6 +58,15 @@ def getXcodePath():
     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)
@@ -328,7 +337,13 @@ def main(scriptName, args):
                     shutil.rmtree(frameworkRootDir)
 
         if options.mac_universal_binary: 
-            configure_opts.append("--enable-universal_binary=%s" % options.mac_universal_binary)
+            if options.mac_universal_binary == 'default':
+                if options.osx_cocoa:
+                    configure_opts.append("--enable-universal_binary=i386,x86_64")                
+                else:
+                    configure_opts.append("--enable-universal_binary")                
+            else:
+                configure_opts.append("--enable-universal_binary=%s" % options.mac_universal_binary)
 
             
         print("Configure options: " + repr(configure_opts))
@@ -402,6 +417,7 @@ def main(scriptName, args):
     
             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")