Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Cocoa by default under OS X in configure.

Browse Source 
Carbon is deprecated.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-07-13 14:58:45 +00:00
parent 46ba8e87c7
commit 58dc544700
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@@ -4102,7 +4102,7 @@ case "${host}" in
$as_echo "#define TARGET_CARBON 1" >>confdefs.h $as_echo "#define TARGET_CARBON 1" >>confdefs.h
DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1 DEFAULT_DEFAULT_wxUSE_OSX_COCOA=1
;; ;;
*-*-beos* ) *-*-beos* )

2
configure.in
View File

@@ -336,7 +336,7 @@ case "${host}" in
AC_DEFINE(__BSD__) AC_DEFINE(__BSD__)
AC_DEFINE(__DARWIN__) AC_DEFINE(__DARWIN__)
AC_DEFINE(TARGET_CARBON) AC_DEFINE(TARGET_CARBON)
DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1 DEFAULT_DEFAULT_wxUSE_OSX_COCOA=1
;; ;;
*-*-beos* ) *-*-beos* )

3
docs/changes.txt
View File

@@ -501,6 +501,9 @@ Changes in behaviour visible to end users
Build system changes Build system changes
-------------------- --------------------
- Cocoa is now used by default under OS X instead of Carbon. Pass --with-carbon
option to configure to use wxCarbon.
- In wxMSW makefile builds, "_x64" is used instead of "_amd64" when compiling - In wxMSW makefile builds, "_x64" is used instead of "_amd64" when compiling
for this architecture in the architecture-specific paths and library names. for this architecture in the architecture-specific paths and library names.
TARGET_CPU can still be specified as "amd64" for compatibility but "x64" TARGET_CPU can still be specified as "amd64" for compatibility but "x64"