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:
12
configure
vendored
12
configure
vendored
@@ -4015,18 +4015,8 @@ case "${host}" in
|
|||||||
DEFAULT_DEFAULT_wxUSE_MSW=1
|
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* )
|
*-*-darwin* )
|
||||||
USE_BSD=1
|
USE_BSD=1
|
||||||
USE_DARWIN=1
|
USE_DARWIN=1
|
||||||
$as_echo "#define __BSD__ 1" >>confdefs.h
|
$as_echo "#define __BSD__ 1" >>confdefs.h
|
||||||
|
|
||||||
|
12
configure.in
12
configure.in
@@ -282,17 +282,9 @@ case "${host}" in
|
|||||||
DEFAULT_DEFAULT_wxUSE_MSW=1
|
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* )
|
*-*-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_BSD=1
|
||||||
USE_DARWIN=1
|
USE_DARWIN=1
|
||||||
AC_DEFINE(__BSD__)
|
AC_DEFINE(__BSD__)
|
||||||
|
@@ -189,6 +189,10 @@ INCOMPATIBLE CHANGES SINCE 3.1.3:
|
|||||||
aliases for the libraries have been added using the 'wx::' namespace. For
|
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.
|
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)
|
3.1.3: (released 2019-10-28)
|
||||||
----------------------------
|
----------------------------
|
||||||
|
Reference in New Issue
Block a user