Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ReShade: Use ALTEXEPATH to install ReShade DLLs for Custom Commands with ONLY_CUSTOMCMD=1 #1092

Merged
merged 4 commits into from
Apr 22, 2024
Merged

ReShade: Use ALTEXEPATH to install ReShade DLLs for Custom Commands with ONLY_CUSTOMCMD=1 #1092

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8319839
ReShade: Use setShaderDest to avoid overwriting ALTEXEPATH if defined
sonic2kk Apr 21, 2024
aedb64b
setFullGameExePath: Use ALTEXEPATH if defined over CUSTOMCMD path
sonic2kk Apr 21, 2024
3b6ffb0
fix missing DEFINEDALTEXEPATH
sonic2kk Apr 21, 2024
c16223f
version bump
sonic2kk Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions steamtinkerlaunch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
PREFIX="/usr"
PROGNAME="SteamTinkerLaunch"
NICEPROGNAME="Steam Tinker Launch"
PROGVERS="v14.0.20240421-1"
PROGVERS="v14.0.20240423-1"
PROGCMD="${0##*/}"
PROGINTERNALPROTNAME="Proton-stl"
SHOSTL="stl"
Expand Down Expand Up @@ -9132,8 +9132,11 @@ function ShaderRepoDialog {

function setFullGameExePath {
if [[ ( "$USECUSTOMCMD" -eq 1 && -f "$CUSTOMCMD" && "$CUSTOMCMDRESHADE" -eq 1 ) || "$ONLY_CUSTOMCMD" -eq 1 ]]; then
FGEP="${CUSTOMCMD%/*}"

# Use Alternative EXE Path if defined instead of custom command path
# We should only use the custom command directory if no alternatiive EXE path is defined, and
# we should prioritise the alt path if it is defined
DEFINEDALTEXEPATH="$(GETALTEXEPATH)"
FGEP="${DEFINEDALTEXEPATH:-${CUSTOMCMD%/*}}"
writelog "INFO" "${FUNCNAME[0]} - Using the directory '$FGEP' of the used custom command as absolute game exe path"

if [ "$CUSTOMCMDRESHADE" -eq 1 ]; then
Expand Down Expand Up @@ -9582,7 +9585,7 @@ function installRSdll {
function installReshade {
if [ "$USERESHADE" -eq 1 ]; then
prepareReshadeFiles
setShadDestDir
setShadDestDir # Have to use setShadDestDir because setShadDest will use ABSGAMEEXEPATH which is not Custom Command

INSTDESTDIR="$SHADDESTDIR"

Expand Down