Compare commits

...

2 Commits

Author SHA1 Message Date
Joshua Ashton 62c866a229
build: Fix installing vkd3d-proton when Wine is built without vkd3d
This would fail previously as Wine does not have d3d12.dll for us to make .old

Closes: #559
Signed-off-by: Joshua Ashton <joshua@froggi.es>
2021-04-27 12:37:21 +01:00
Joshua Ashton 30c6605f25
build: Avoid Wine Mono and Gecko installs in the setup script
Co-authored-by: Alexis Peypelut <iroalexis@outlook.fr>
Signed-off-by: Joshua Ashton <joshua@froggi.es>
2021-04-27 12:20:01 +01:00
1 changed files with 9 additions and 3 deletions

View File

@ -44,6 +44,9 @@ fi
# find wine executable
export WINEDEBUG=-all
# disable mscoree and mshtml to avoid downloading
# wine gecko and mono
export WINEDLLOVERRIDES="mscoree,mshtml="
wine="wine"
wine64="wine64"
@ -117,11 +120,10 @@ installFile() {
else
rm -v "${dstfile}"
fi
$file_cmd "${srcfile}" "${dstfile}"
else
echo "${dstfile}: File not found in wine prefix" >&2
return 1
touch "${dstfile}.old_none"
fi
$file_cmd "${srcfile}" "${dstfile}"
fi
return 0
}
@ -145,6 +147,10 @@ uninstallFile() {
rm -v "${dstfile}"
mv -v "${dstfile}.old" "${dstfile}"
return 0
elif [ -f "${dstfile}.old_none" ]; then
rm -v "${dstfile}.old_none"
rm -v "${dstfile}"
return 0
else
return 1
fi