Use Cocoa by default for --with-osx and --with-mac configure options.

Even though Cocoa is now officially the default port, these options still
selected Carbon.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-11-10 18:25:40 +00:00
parent aa2169b88d
commit 177aa57194
2 changed files with 5 additions and 5 deletions

6
configure vendored
View File

@@ -2310,7 +2310,7 @@ Optional Packages:
--with-osx_carbon use Mac OS X (Carbon)
--with-osx_cocoa use Mac OS X (Cocoa)
--with-osx_iphone use iPhone OS X port
--with-osx use Mac OS X (default port, currently Carbon)
--with-osx use Mac OS X (default port, Cocoa)
--with-carbon same as --with-osx_carbon
--with-cocoa same as --with-osx_cocoa
--with-iphone same as --with-osx_iphone
@@ -4517,7 +4517,7 @@ fi
# Check whether --with-osx was given.
if test "${with_osx+set}" = set; then :
withval=$with_osx; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1
withval=$with_osx; wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1
fi
@@ -4541,7 +4541,7 @@ fi
# Check whether --with-mac was given.
if test "${with_mac+set}" = set; then :
withval=$with_mac; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1
withval=$with_mac; wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1
fi