]> git.saurik.com Git - wxWidgets.git/commitdiff
Allow --mac_universal_binary to use a "default" value.
authorRobin Dunn <robin@alldunn.com>
Thu, 9 Aug 2012 16:54:24 +0000 (16:54 +0000)
committerRobin Dunn <robin@alldunn.com>
Thu, 9 Aug 2012 16:54:24 +0000 (16:54 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

build/tools/build-wxwidgets.py

index 8218c87b0fb5c8e56c9c975da8ce4c5bd23496bd..3c5bf07e5c2d4617428c1071cce55ee322b12ab9 100755 (executable)
@@ -337,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))