Update DXVK to version 1.7.3

In evesetup.shlib function check_wine are now skippable to make using of customized wine-scripts possible.

1 files changed, 43 insertions, 43 deletions

diff --git a/evesetup.shlib b/evesetup.shlib
index 5a96862d1195..76742d4a8dd9 100644
--- a/evesetup.shlib
+++ b/evesetup.shlib
@@ -73,51 +73,51 @@ check_wine() {
 	else
 		WINE=$WINEPATH/wine
 	fi
-	if [ ! -x "$WINE" ] ;then
-		desktop_msg "ERROR: \"$CUSTOMWP\" not found!"
-		exit 1
-	fi
-	INSTWINE=$(tr -dc [:digit:] 2>/dev/null < $WINEPREFIX/.update-timestamp || printf 0)
-	WINEINFP=$(readlink -f $CUSTOMWP)
-	WINECONF=$(find ${WINEINFP%bin*}share/wine* -name 'wine.inf')
-	WINEDATE=$(getdate $WINECONF)
-	if [ "$WINEDATE" != "$INSTWINE" ] ;then
-		desktop_msg "Prepare wine environment for EVE"
-		for DXVKFILE in d3d10_1 d3d10core d3d10 d3d11 d3d9 dxgi ;do
-			rm $WINSYSDIR/$DXVKFILE.dll* || true
-			rm $W32SYSDIR/$DXVKFILE.dll* || true
-			sed -i /\"$DXVKFILE\"=\"/d $WINEPREFIX/user.reg || true
-		done
-		env WINEPREFIX=$WINEPREFIX \
-			WINEDEBUG=-all \
-			WINEDLLOVERRIDES="mscoree,mshtml=d" \
-			$WINE wineboot
-		env WINEPREFIX=$WINEPREFIX \
-			$WINE reg add \
-			'HKCU\Software\Wine\FileOpenAssociations' \
-			/v Enable /d N /f >/dev/null
-	fi
-	if [ -d "$DXVKLIBDIR" ] ;then
-		DXVKARC=$(getdate $DXVKLIBDIR/x64/d3d11.dll)
-		INSTDX=$(getdate $WINSYSDIR/d3d11.dll)
-		if [ "$INSTDX" != "$DXVKARC" ] ;then
-			for DXVKFILE in $DXVKFILELIST ;do
-				cp --preserve=timestamps $DXVKLIBDIR/x64/$DXVKFILE.dll $WINSYSDIR/$DXVKFILE.dll
-				if [ -d "$W32SYSDIR" ] ;then
-					cp --preserve=timestamps $DXVKLIBDIR/x32/$DXVKFILE.dll $W32SYSDIR/$DXVKFILE.dll
-				fi
-				env WINEPREFIX=$WINEPREFIX \
-					$WINE reg add \
-					'HKCU\Software\Wine\DllOverrides' \
-					/v $DXVKFILE /d native /f >/dev/null
+	if [ -x "$WINE" ] ;then
+		INSTWINE=$(tr -dc [:digit:] 2>/dev/null < $WINEPREFIX/.update-timestamp || printf 0)
+		WINEINFP=$(readlink -f $CUSTOMWP)
+		WINECONF=$(find ${WINEINFP%bin*}share/wine* -name 'wine.inf')
+		WINEDATE=$(getdate $WINECONF)
+		if [ "$WINEDATE" != "$INSTWINE" ] ;then
+			desktop_msg "Prepare wine environment for EVE"
+			for DXVKFILE in d3d10_1 d3d10core d3d10 d3d11 d3d9 dxgi ;do
+				rm $WINSYSDIR/$DXVKFILE.dll* || true
+				rm $W32SYSDIR/$DXVKFILE.dll* || true
+				sed -i /\"$DXVKFILE\"=\"/d $WINEPREFIX/user.reg || true
 			done
+			env WINEPREFIX=$WINEPREFIX \
+				WINEDEBUG=-all \
+				WINEDLLOVERRIDES="mscoree,mshtml=d" \
+				$WINE wineboot
+			env WINEPREFIX=$WINEPREFIX \
+				$WINE reg add \
+				'HKCU\Software\Wine\FileOpenAssociations' \
+				/v Enable /d N /f >/dev/null
 		fi
-	fi
-	if [ "$(grep -csw winemenubuilder $WINEPREFIX/system.reg)" != "0" ] ;then
-		env WINEPREFIX=$WINEPREFIX \
-			$WINE reg delete \
-			'HKLM\Software\Microsoft\Windows\CurrentVersion\RunServices' \
-			/v winemenubuilder /f >/dev/null
+		if [ -d "$DXVKLIBDIR" ] ;then
+			DXVKARC=$(getdate $DXVKLIBDIR/x64/d3d10core.dll)
+			INSTDX=$(getdate $WINSYSDIR/d3d10core.dll)
+			if [ "$INSTDX" != "$DXVKARC" ] ;then
+				for DXVKFILE in $DXVKFILELIST ;do
+					cp --preserve=timestamps $DXVKLIBDIR/x64/$DXVKFILE.dll $WINSYSDIR/$DXVKFILE.dll
+					if [ -d "$W32SYSDIR" ] ;then
+						cp --preserve=timestamps $DXVKLIBDIR/x32/$DXVKFILE.dll $W32SYSDIR/$DXVKFILE.dll
+					fi
+					env WINEPREFIX=$WINEPREFIX \
+						$WINE reg add \
+						'HKCU\Software\Wine\DllOverrides' \
+						/v $DXVKFILE /d native /f >/dev/null
+				done
+			fi
+		fi
+		if [ "$(grep -csw winemenubuilder $WINEPREFIX/system.reg)" != "0" ] ;then
+			env WINEPREFIX=$WINEPREFIX \
+				$WINE reg delete \
+				'HKLM\Software\Microsoft\Windows\CurrentVersion\RunServices' \
+				/v winemenubuilder /f >/dev/null
+		fi
+	else
+		desktop_msg "Info: Wine environment test skipped."
 	fi
 }