Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-15 15:49:36 +02:00
Code Issues Releases Wiki Activity

Remove unnecessary SDK handling

Browse Source 
And restrict 32-bit builds to <OS 10.15 and <SDK 10.14
This commit is contained in:
Leland Lucius 2020-01-05 13:54:08 -06:00
parent 129c9deb99
commit 3637f134ac
1 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
mac/scripts/build_wxwidgets
View File

@ -27,38 +27,36 @@ function bld
export CXX="g++ -std=c++1z -stdlib=libc++" export CXX="g++ -std=c++1z -stdlib=libc++"
export LD="g++ -std=c++1z -stdlib=libc++" export LD="g++ -std=c++1z -stdlib=libc++"
# Ensure configure uses the proper SDK while performing its tests
run="xcrun ${sdkdir:+-sdk ${asdf}}"
# NOTES: liblzma isn't available on MacOS 10.8 or older and Audacity doesn't # NOTES: liblzma isn't available on MacOS 10.8 or older and Audacity doesn't
# need it. So, build wxWidgets without the support to allow Audacity # need it. So, build wxWidgets without the support to allow Audacity
# to run on MacOS 10.7 or newer. # to run on MacOS 10.7 or newer.
${run} ../configure --prefix="/usr/local/${arch}" \ ../configure --prefix="/usr/local/${arch}" \
--enable-macosx-arch="${arch}" \ --enable-macosx-arch="${arch}" \
--enable-shared=yes \ --enable-shared=yes \
--enable-unicode=yes \ --enable-unicode=yes \
--enable-universal_binary=no \ --enable-universal_binary=no \
--enable-webkit=no \ --enable-webkit=no \
--with-expat=builtin \ --with-expat=builtin \
--with-flavour="${flavour}" \ --with-flavour="${flavour}" \
--with-libjpeg=builtin \ --with-libjpeg=builtin \
--with-libpng=builtin \ --with-libpng=builtin \
--with-libtiff=builtin \ --with-libtiff=builtin \
--with-macosx-sdk="${sdkdir}" \ --with-macosx-sdk="${sdkdir}" \
--with-macosx-version-min="${minver}" \ --with-macosx-version-min="${minver}" \
--with-regex=builtin \ --with-regex=builtin \
--with-zlib=builtin \ --with-zlib=builtin \
--without-liblzma \ --without-liblzma \
${@} ${@}
${run} make -j $(sysctl -n hw.ncpu) install make -j $(sysctl -n hw.ncpu) install
popd popd
} }
# If building on 10.15 (Catalina) or newer, 32-bit versions can't be # Only build 32-bit version if running on 10.14 or older and
# created without forcing "configure" to cross compile. # using the 10.13 SDK or older.
arches="x86_64" arches="x86_64"
osver=$(sw_vers -productVersion) osver="$(sw_vers -productVersion)"
if [ "${osver}" \< "10.15" ] sdkver="$(xcrun --show-sdk-version)"
if [ "${osver}" \< "10.15" -a "${sdkver}" \< "10.14" ]
then then
arches="${arches} i386" arches="${arches} i386"
fi fi