Merge branch 'mac-build'
Improve Mac build documentation and build itself. See #24128.
This commit is contained in:
commit
e21b27019f
5 changed files with 80 additions and 26 deletions
6
configure
vendored
6
configure
vendored
|
|
@ -22833,10 +22833,8 @@ $as_echo "$as_me: WARNING: --enable-macosx_arch is ignored when --enable-univers
|
|||
|
||||
if test "x$wxUSE_UNIVERSAL_BINARY" != xyes; then
|
||||
OSX_ARCH_OPTS=$wxUSE_UNIVERSAL_BINARY
|
||||
else OSX_ARCH_OPTS="i386"
|
||||
if test "$wxUSE_OSX_COCOA" = 1; then
|
||||
OSX_ARCH_OPTS="$OSX_ARCH_OPTS,x86_64"
|
||||
fi
|
||||
else
|
||||
OSX_ARCH_OPTS=arm64,x86_64
|
||||
fi
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for architectures to use in universal binary" >&5
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue