Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Update mingw build.sh
  • Loading branch information
manisandro committed Sep 7, 2021
1 parent 898967e commit 9509952
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions ms-windows/mingw/build.sh
Expand Up @@ -170,14 +170,15 @@ function linkDep {
local name="$(basename $1)"
test -e "$destdir/$name" && return 0
test -e "$destdir/qgisplugins/$name" && return 0
[[ "$1" == *api-ms-win* ]] && return 0
([[ "$1" == *api-ms-win* ]] || [[ "$1" == *MSVCP*.dll ]] || [[ "$1" == *VCRUNTIME*.dll ]] ) && return 0
echo "${indent}${1}"
[ ! -e "$MINGWROOT/$1" ] && echo "Error: missing $MINGWROOT/$1" && return 1
mkdir -p "$destdir" || return 1
lnk "$MINGWROOT/$1" "$destdir/$name" || return 1
echo "${2:-bin}/$name: $(rpm -qf "$MINGWROOT/$1")" >> $installprefix/origins.txt
autoLinkDeps "$destdir/$name" "${indent} " || return 1
([ -e "$MINGWROOT/$1.debug" ] && lnk "$MINGWROOT/$1.debug" "$destdir/$name.debug") || ( ($DEBUG && echo "Warning: missing $name.debug") || :)
[ -e "/usr/lib/debug${MINGWROOT}/$1.debug" ] && lnk "/usr/lib/debug${MINGWROOT}/$1.debug" "$destdir/$name.debug" || :
[ -e "$MINGWROOT/$1.debug" ] && lnk "$MINGWROOT/$1.debug" "$destdir/$name.debug" || :
return 0
}

Expand Down Expand Up @@ -205,6 +206,10 @@ done
IFS=$SAVEIFS
)

# Gdal plugins
mkdir -p "$installprefix/lib/"
cp -a "$MINGWROOT/lib/gdalplugins" "$installprefix/lib/gdalplugins"

echo "Linking dependencies..."
binaries=$(find "$installprefix" -name '*.exe' -or -name '*.dll' -or -name '*.pyd')
for binary in $binaries; do
Expand Down

0 comments on commit 9509952

Please sign in to comment.