solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'mac-build'

Browse source 
Improve Mac build documentation and build itself.

See #24128.
This commit is contained in:
Vadim Zeitlin 2024-01-03 20:27:00 +01:00
commit e21b27019f
5 changed files with 80 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

12
configure.ac
View file

@ -1160,10 +1160,14 @@ if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then
if test "x$wxUSE_UNIVERSAL_BINARY" != xyes; then
OSX_ARCH_OPTS=$wxUSE_UNIVERSAL_BINARY
else dnl Use all architectures supported
OSX_ARCH_OPTS="i386"
if test "$wxUSE_OSX_COCOA" = 1; then
OSX_ARCH_OPTS="$OSX_ARCH_OPTS,x86_64"
else
dnl Use default architectures for the universal binaries: x86_64 is
dnl currently supported everywhere...
OSX_ARCH_OPTS=x86_64
dnl ... and non-ancient macOS versions also support ARM.
if [ `sw_vers -productVersion | sed 's/\..*//'` -gt 10 ]; then
OSX_ARCH_OPTS=arm64,$OSX_ARCH_OPTS
fi
fi