Merge branch 'mingw-crossdev-wine-linuxmint' (#64)

This commit is contained in:
Sebastian Pipping 2017-06-28 16:03:52 +02:00
commit 58663de348

View File

@ -67,11 +67,21 @@ _copy_missing_mingw_libaries() {
# * coverage GCC flags make them needed # * coverage GCC flags make them needed
# * With WINEDLLPATH Wine looks for .dll.so in these folders, not .dll # * With WINEDLLPATH Wine looks for .dll.so in these folders, not .dll
local target="$1" local target="$1"
local mingw_dll_dir="$(dirname "$(ls -1 /usr/lib*/gcc/i686-w64-mingw32/*/libgcc_s_sjlj-1.dll | head -n1)")" local mingw_gcc_dll_dir="$(dirname "$(ls -1 /usr/lib*/gcc/i686-w64-mingw32/*/libgcc_s_sjlj-1.dll | head -n1)")"
for dll in libgcc_s_sjlj-1.dll libstdc++-6.dll; do for dll in libgcc_s_sjlj-1.dll libstdc++-6.dll; do
( (
set -x set -x
ln -s "${mingw_dll_dir}"/${dll} "${target}"/${dll} ln -s "${mingw_gcc_dll_dir}"/${dll} "${target}"/${dll}
)
done
local mingw_pthread_dll_dir="$(dirname "$(ls -1 /usr/i686-w64-mingw32/lib*/libwinpthread-1.dll | head -n1)")"
for dll in libwinpthread-1.dll; do
source="${mingw_pthread_dll_dir}"/${dll}
[[ -e "${source}" ]] || continue
(
set -x
ln -s "${source}" "${target}"/${dll}
) )
done done
} }