storm/audiogame-manager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved 64 bit wine support. Thanks Daniel Nash for the working 64 bit prefix. This prefix contains RHVoice with the BDL voice. So far, only new installs of Bloodshed use the 64 bit prefix. I will switch more over when there has been more testing.

Browse Source
This commit is contained in:
Storm Dragon 2021-07-04 03:50:01 -04:00
parent 00cc15f5d0
commit 544aec32a4
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
audiogame-manager.sh
View File

@ -440,10 +440,8 @@ install_wine_bottle() {
exit 1 exit 1
fi fi
fi fi
mkdir -p "$HOME/.local/wine/${bottle}"
export WINEPREFIX="$HOME/.local/wine/${bottle}" export WINEPREFIX="$HOME/.local/wine/${bottle}"
# Arguments to the function are dependancies to be installed. # Arguments to the function are dependancies to be installed.
(DISPLAY="" wineboot -u
# Get location of mono and gecko. # Get location of mono and gecko.
monoPath="$(find /usr/share/wine/mono -name "wine-mono*x86.msi")" monoPath="$(find /usr/share/wine/mono -name "wine-mono*x86.msi")"
geckoPath="$(find /usr/share/wine/gecko -name "wine-gecko*x86.msi")" geckoPath="$(find /usr/share/wine/gecko -name "wine-gecko*x86.msi")"
@ -455,9 +453,23 @@ install_wine_bottle() {
download 'http://dl.winehq.org/wine/wine-gecko/2.40/wine_gecko-2.40-x86.msi' download 'http://dl.winehq.org/wine/wine-gecko/2.40/wine_gecko-2.40-x86.msi'
geckoPath="${cache}/wine_gecko-2.40-x86.msi" geckoPath="${cache}/wine_gecko-2.40-x86.msi"
fi fi
wine msiexec /i z:"$monoPath" /quiet if [[ "${WINEARCH}" == "win32" ]]; then
wine msiexec /i z:"$geckoPath" /quiet # This is in a brace list to pipe through dialog.
winetricks -q $@ ${winVer:-winxp} ${winetricksSettings}) | dialog --progressbox "Installing wine bottle, please wait..." -1 -1 { DISPLAY="" wineboot -u
wine msiexec /i z:"$monoPath" /quiet
wine msiexec /i z:"$geckoPath" /quiet
winetricks -q $@ ${winVer:-winxp} ${winetricksSettings}; } | dialog --progressbox "Installing wine bottle, please wait..." -1 -1
else
# This is in a brace list to pipe through dialog.
download https://nashcentral.duckdns.org/projects/wine.tar.gz
{ tar xf "${cache}/wine.tar.gz" -C "${HOME}/.local/wine/"
mv "${HOME}/.local/wine/.wine/drive_c/users/user" "${HOME}/.local/wine/.wine/drive_c/users/${USER}"
mv "${HOME}/.local/wine/.wine/" "${WINEPREFIX}/"
wine64 cmd /c exit
wine msiexec /i z:"$monoPath" /quiet
wine msiexec /i z:"$geckoPath" /quiet
winetricks -q $@ ${winVer:-win7} ${winetricksSettings}; } | dialog --progressbox "Installing wine bottle, please wait..." -1 -1
fi
} }
@ -1339,8 +1351,9 @@ case "${game}" in
add_launcher "c:\Program Files\Games\yahtzeeB\BGYahtzee.exe" add_launcher "c:\Program Files\Games\yahtzeeB\BGYahtzee.exe"
;; ;;
"Bloodshed") "Bloodshed")
export WINEARCH="win64"
export winVer="win7" export winVer="win7"
install_wine_bottle speechsdk install_wine_bottle
download "http://www.samtupy.com/games/bloodshed.exe" download "http://www.samtupy.com/games/bloodshed.exe"
cp "${cache}/bloodshed.exe" "$WINEPREFIX/drive_c/Program Files/" cp "${cache}/bloodshed.exe" "$WINEPREFIX/drive_c/Program Files/"
add_launcher "c:\Program Files\bloodshed.exe" add_launcher "c:\Program Files\bloodshed.exe"