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
This commit is contained in:
Robin Dunn
2014-11-27 22:23:49 +00:00
parent a20ff140f1
commit 163f2169ed

View File

@@ -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")