StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

fix(CI): Correct Wine lib path for winehq manual install

Browse Source 
Install path changed in 79feb19d7d,
but paths were not updated to match.

Fix #6481
This commit is contained in:
Anthony Bilinski 2022-02-19 07:17:32 -08:00
parent e9f74bb50a
commit 80a0a4ae62
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
windows/cross-compile/build.sh
View File

@ -194,10 +194,10 @@ while IFS= read -r line
do do
if [[ "$ARCH" == "i686" ]] if [[ "$ARCH" == "i686" ]]
then then
WINE_DLL_DIR="/root/.wine/drive_c/windows/system32" WINE_DLL_DIR="/opt/wine-stable/lib/wine/i386-windows"
elif [[ "$ARCH" == "x86_64" ]] elif [[ "$ARCH" == "x86_64" ]]
then 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 fi
python3 /usr/local/bin/mingw-ldd.py $line --dll-lookup-dirs $QTOX_PREFIX_DIR $WINE_DLL_DIR --output-format tree >> dlls-required 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) done < <(cat exes runtime-dlls)
@ -221,7 +221,7 @@ then
fi fi
# Check that OpenAL is bundled. It is availabe from WINE, but not on Windows systems # 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 then
cat dlls-required cat dlls-required
echo "Error: Missing OpenAL." echo "Error: Missing OpenAL."