Merge branch 'master' of github.com:wxWidgets/wxWidgets

This commit is contained in:
Xaviou
2018-03-09 19:03:01 +01:00
2 changed files with 2 additions and 2 deletions

2
configure vendored
View File

@@ -20103,7 +20103,7 @@ $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="ppc,i386"
else OSX_ARCH_OPTS="i386"
if test "$wxUSE_OSX_COCOA" = 1; then
OSX_ARCH_OPTS="$OSX_ARCH_OPTS,x86_64"
fi

View File

@@ -1154,7 +1154,7 @@ 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="ppc,i386"
OSX_ARCH_OPTS="i386"
if test "$wxUSE_OSX_COCOA" = 1; then
OSX_ARCH_OPTS="$OSX_ARCH_OPTS,x86_64"
fi