Commit 40c0b3c1 authored by Tk-Glitch's avatar Tk-Glitch

proton-tkg: When a dxvk release version is used, don't apply...

proton-tkg: When a dxvk release version is used, don't apply dxvk_config_dxgi_support patch and use dxvk's dxgi by default (thus requiring to disable it on a per-game bases if one wants to use vkd3d/d3d12). Indeed, DXVK releases don't provide the dxvk config lib.
parent c647b1ce
......@@ -248,6 +248,7 @@ else
if [ -e "$1" ]; then
sed -i -e "s|_EXT_CONFIG_PATH.*|_EXT_CONFIG_PATH=$1|" "$_where"/wine-tkg-profiles/advanced-customization.cfg
fi
build_wine_tkg
fi
......
......@@ -202,6 +202,9 @@ msg2 ''
if [ "$_ispkgbuild" == "true" ]; then
_steamvr_support="false"
fi
if [ "$_use_dxvk" == "release" ]; then
_dxvk_dxgi="true"
fi
elif [ "$_EXTERNAL_INSTALL" == "true" ] && [ "$_EXTERNAL_INSTALL_TYPE" == "proton" ]; then
error "It looks like you're attempting to build a Proton version of wine-tkg-git."
error "This special option doesn't use pacman and requires you to run 'proton-tkg.sh' script from proton-tkg dir."
......@@ -1409,7 +1412,7 @@ EOM
fi
# Add support for dxvk_config library to Wine's dxgi when vkd3d support is enabled
if [ "$_use_vkd3d" == "true" ] && git merge-base --is-ancestor 74dc0c5df9c3094352caedda8ebe14ed2dfd615e HEAD; then
if [ "$_use_vkd3d" == "true" ] && [ "$_use_dxvk" != "release" ] && git merge-base --is-ancestor 74dc0c5df9c3094352caedda8ebe14ed2dfd615e HEAD; then
if git merge-base --is-ancestor 591068cec06257f3d5ed23e19ee4ad055ad978aa HEAD; then
_patchname='dxvk_config_dxgi_support.patch' && _patchmsg="Add support for dxvk_config library to Wine's dxgi" && nonuser_patcher
else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment