minor update to ./installdeps

For arch cross builds, try to install both the mingw -headers-git and
-crt-git .
This commit is contained in:
Rafael Kitover 2016-12-13 10:38:15 -05:00
parent 68f2badae7
commit 94b62b13b3
1 changed files with 10 additions and 6 deletions

View File

@ -217,9 +217,9 @@ archlinux_installdeps() {
pkg_prefix='mingw-w64-' pkg_prefix='mingw-w64-'
# cross toolchain (without crt) # cross toolchain (without headers and crt, we'll use -git versions)
set -- set --
for p in binutils gcc headers winpthreads; do for p in binutils gcc winpthreads; do
set -- "$@" "${pkg_prefix}${p}" set -- "$@" "${pkg_prefix}${p}"
done done
check $pacman --noconfirm --needed -S "$@" check $pacman --noconfirm --needed -S "$@"
@ -242,10 +242,14 @@ archlinux_installdeps() {
# now do the AUR builds # now do the AUR builds
# first we need -crt-git (unless -crt is installed) # first we need -headers-git and -crt-git (unless the non-git packages are installed)
if ! $pacman -Q "${pkg_prefix}crt" >/dev/null 2>&1; then for p in "${pkg_prefix}headers" "${pkg_prefix}crt"; do
check $pacman --noconfirm --needed -S "${pkg_prefix}crt-git" if ! $pacman -Q "$p" >/dev/null 2>&1; then
fi check $pacman --noconfirm --needed -S "${p}-git"
else
warning "${pkg_prefix}headers-git and ${pkg_prefix}crt-git are recommended over the regular versions, if you have build failures try to install them"
fi
done
# and the actual deps # and the actual deps
for p in zlib gettext libpng libtiff pkg-config sdl2 openal wxmsw; do for p in zlib gettext libpng libtiff pkg-config sdl2 openal wxmsw; do