diff --git a/configure b/configure index 56fe391b27..9625b7d470 100755 --- a/configure +++ b/configure @@ -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 diff --git a/configure.in b/configure.in index afbe54eacb..3add79588d 100644 --- a/configure.in +++ b/configure.in @@ -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__) diff --git a/docs/changes.txt b/docs/changes.txt index 91e460d770..6bdb254eb6 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -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) ----------------------------