Default to building wxOSX, not wxiOS, under Apple ARM platforms

Now that desktop Macs using ARM exist, we should default to building the
normal, macOS-targeting, port on them and not wxiOS any more.

This is a backwards incompatible change, but it shouldn't affect many
people, so should hopefully be fine.
This commit is contained in:
Vadim Zeitlin
2020-07-01 18:31:11 +02:00
parent 5a0723223d
commit d7c6dc6235
3 changed files with 7 additions and 21 deletions

12
configure vendored
View File

@@ -4015,18 +4015,8 @@ case "${host}" in
DEFAULT_DEFAULT_wxUSE_MSW=1
;;
arm-apple-darwin*)
USE_BSD=1
USE_DARWIN=1
$as_echo "#define __BSD__ 1" >>confdefs.h
$as_echo "#define __DARWIN__ 1" >>confdefs.h
DEFAULT_DEFAULT_wxUSE_OSX_IPHONE=1
;;
*-*-darwin* )
USE_BSD=1
USE_BSD=1
USE_DARWIN=1
$as_echo "#define __BSD__ 1" >>confdefs.h

View File

@@ -282,17 +282,9 @@ case "${host}" in
DEFAULT_DEFAULT_wxUSE_MSW=1
;;
arm-apple-darwin*)
dnl iPhone
USE_BSD=1
USE_DARWIN=1
AC_DEFINE(__BSD__)
AC_DEFINE(__DARWIN__)
DEFAULT_DEFAULT_wxUSE_OSX_IPHONE=1
;;
*-*-darwin* )
dnl Darwin based distributions (including Mac OS X)
dnl Some platform using Darwin, i.e. one of the Apple OS: we target macOS
dnl by default on them, use --with-osx_iphone explicitly for iOS.
USE_BSD=1
USE_DARWIN=1
AC_DEFINE(__BSD__)

View File

@@ -189,6 +189,10 @@ INCOMPATIBLE CHANGES SINCE 3.1.3:
aliases for the libraries have been added using the 'wx::' namespace. For
example, the core library is now named wxcore and has alias wx::core.
- Building on ARM Apple platforms using configure now targets macOS by
default, and not iOS. Please use --with-osx_iphone explicitly if you need
the latter.
3.1.3: (released 2019-10-28)
----------------------------