From 163f2169ed04dd31c4e8f5a306735486b8105b83 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 27 Nov 2014 22:23:49 +0000 Subject: [PATCH] Allow explicitly selecting the carbon build since it is not the default anymore. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@78202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/tools/build-wxwidgets.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/build/tools/build-wxwidgets.py b/build/tools/build-wxwidgets.py index c767b72415..7777b40ded 100755 --- a/build/tools/build-wxwidgets.py +++ b/build/tools/build-wxwidgets.py @@ -214,8 +214,8 @@ def main(scriptName, args): "rebake" : (False, "Regenerate Bakefile and autoconf files"), "unicode" : (False, "Build the library with unicode support"), "wxpython" : (False, "Build the wxWidgets library with all options needed by wxPython"), - "cocoa" : (False, "Build the old Mac Cocoa port."), - "osx_cocoa" : (False, "Build the new Cocoa port"), + "osx_cocoa" : (False, "Build the Cocoa port"), + "osx_carbon" : (False, "Build the Carbon port"), "shared" : (False, "Build wx as a dynamic library"), "extra_make" : ("", "Extra args to pass on [n]make's command line."), "features" : ("", "A comma-separated list of wxUSE_XYZ defines on Win, or a list of configure flags on unix."), @@ -259,11 +259,10 @@ def main(scriptName, args): if options.debug: configure_opts.append("--enable-debug") - if options.cocoa: - configure_opts.append("--with-old_cocoa") - if options.osx_cocoa: configure_opts.append("--with-osx_cocoa") + elif options.osx_carbon: + configure_opts.append("--with-osx_carbon") if options.gtk3: configure_opts.append("--with-gtk=3")