From 80a0a4ae620d299d2379c28613d3298643f3fd19 Mon Sep 17 00:00:00 2001 From: Anthony Bilinski Date: Sat, 19 Feb 2022 07:17:32 -0800 Subject: [PATCH] fix(CI): Correct Wine lib path for winehq manual install Install path changed in 79feb19d7d74be5c5b5862298818cc69507fda15, but paths were not updated to match. Fix #6481 --- windows/cross-compile/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/windows/cross-compile/build.sh b/windows/cross-compile/build.sh index 0ec75cdc2..2fe6a8c33 100755 --- a/windows/cross-compile/build.sh +++ b/windows/cross-compile/build.sh @@ -194,10 +194,10 @@ while IFS= read -r line do if [[ "$ARCH" == "i686" ]] then - WINE_DLL_DIR="/root/.wine/drive_c/windows/system32" + WINE_DLL_DIR="/opt/wine-stable/lib/wine/i386-windows" elif [[ "$ARCH" == "x86_64" ]] then - WINE_DLL_DIR="/root/.wine/drive_c/windows/system32 /root/.wine/drive_c/windows/syswow64" + WINE_DLL_DIR="/opt/wine-stable/lib/wine/i386-windows /opt/wine-stable/lib64/wine/x86_64-windows" fi python3 /usr/local/bin/mingw-ldd.py $line --dll-lookup-dirs $QTOX_PREFIX_DIR $WINE_DLL_DIR --output-format tree >> dlls-required done < <(cat exes runtime-dlls) @@ -221,7 +221,7 @@ then fi # Check that OpenAL is bundled. It is availabe from WINE, but not on Windows systems -if grep -q '/root/.wine/drive_c/windows/system32/openal32.dll' dlls-required +if grep -q '/opt/wine-stable/lib/wine/i386-windows/openal32.dll' dlls-required then cat dlls-required echo "Error: Missing OpenAL."