Skip to content

Commit

Permalink
fix(CI): Correct Wine lib path for winehq manual install
Browse files Browse the repository at this point in the history
Install path changed in 79feb19,
but paths were not updated to match.

Fix qTox#6481
  • Loading branch information
anthonybilinski committed Feb 20, 2022
1 parent e9f74bb commit 80a0a4a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions windows/cross-compile/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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."
Expand Down

0 comments on commit 80a0a4a

Please sign in to comment.