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

Special K: Remove dxsetup and vc2022 installation #898

Merged
merged 5 commits into from
Sep 6, 2023
Merged

Special K: Remove dxsetup and vc2022 installation #898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
be53591
Special K: Remove dxsetup and vc2022 installation
sonic2kk Sep 6, 2023
72f0146
Special K: Remove commented code
sonic2kk Sep 6, 2023
672df9d
Special K: use langfile string for notifier
sonic2kk Sep 6, 2023
9eb27a2
Merge branch 'master' into specialk-remove-steamworks-install
sonic2kk Sep 6, 2023
e3bd02c
version bump
sonic2kk Sep 6, 2023
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
1 change: 1 addition & 0 deletions lang/chinese.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1207,3 +1207,4 @@ NOTY_INSTALLSLR_NOTOOLMANIFEST="No tool_manifest.vdf found for given Proton vers
NOTY_INSTALLSLR_INVALIDGAME="Could not find Proton version for selected game, unable to install Steam Linux Runtime"
GUI_USEGAMESCOPEWSI="Enable USE_GAMESCOPE_WSI"
DESC_USEGAMESCOPEWSI="This can be useful for some HDR options and for some DXVK v2.3 vsync optimisations"
NOTY_SPECIALKINSTALLING="Installing SpecialK..."
1 change: 1 addition & 0 deletions lang/dutch.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1206,3 +1206,4 @@ NOTY_INSTALLSLR_NOTOOLMANIFEST="No tool_manifest.vdf found for given Proton vers
NOTY_INSTALLSLR_INVALIDGAME="Could not find Proton version for selected game, unable to install Steam Linux Runtime"
GUI_USEGAMESCOPEWSI="Enable USE_GAMESCOPE_WSI"
DESC_USEGAMESCOPEWSI="This can be useful for some HDR options and for some DXVK v2.3 vsync optimisations"
NOTY_SPECIALKINSTALLING="Installing SpecialK..."
1 change: 1 addition & 0 deletions lang/english.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1207,3 +1207,4 @@ NOTY_INSTALLSLR_NOTOOLMANIFEST="No tool_manifest.vdf found for given Proton vers
NOTY_INSTALLSLR_INVALIDGAME="Could not find Proton version for selected game, unable to install Steam Linux Runtime"
GUI_USEGAMESCOPEWSI="Enable USE_GAMESCOPE_WSI"
DESC_USEGAMESCOPEWSI="This can be useful for some HDR options and for some DXVK v2.3 vsync optimisations"
NOTY_SPECIALKINSTALLING="Installing SpecialK..."
1 change: 1 addition & 0 deletions lang/englishUK.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1206,3 +1206,4 @@ NOTY_INSTALLSLR_NOTOOLMANIFEST="No tool_manifest.vdf found for given Proton vers
NOTY_INSTALLSLR_INVALIDGAME="Could not find Proton version for selected game, unable to install Steam Linux Runtime"
GUI_USEGAMESCOPEWSI="Enable USE_GAMESCOPE_WSI"
DESC_USEGAMESCOPEWSI="This can be useful for some HDR options and for some DXVK v2.3 vsync optimisations"
NOTY_SPECIALKINSTALLING="Installing SpecialK..."
1 change: 1 addition & 0 deletions lang/french.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1206,3 +1206,4 @@ NOTY_INSTALLSLR_NOTOOLMANIFEST="No tool_manifest.vdf found for given Proton vers
NOTY_INSTALLSLR_INVALIDGAME="Could not find Proton version for selected game, unable to install Steam Linux Runtime"
GUI_USEGAMESCOPEWSI="Enable USE_GAMESCOPE_WSI"
DESC_USEGAMESCOPEWSI="This can be useful for some HDR options and for some DXVK v2.3 vsync optimisations"
NOTY_SPECIALKINSTALLING="Installing SpecialK..."
1 change: 1 addition & 0 deletions lang/german.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1208,3 +1208,4 @@ NOTY_INSTALLSLR_NOTOOLMANIFEST="No tool_manifest.vdf found for given Proton vers
NOTY_INSTALLSLR_INVALIDGAME="Could not find Proton version for selected game, unable to install Steam Linux Runtime"
GUI_USEGAMESCOPEWSI="Enable USE_GAMESCOPE_WSI"
DESC_USEGAMESCOPEWSI="This can be useful for some HDR options and for some DXVK v2.3 vsync optimisations"
NOTY_SPECIALKINSTALLING="Installing SpecialK..."
1 change: 1 addition & 0 deletions lang/italian.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1206,3 +1206,4 @@ NOTY_INSTALLSLR_NOTOOLMANIFEST="No tool_manifest.vdf found for given Proton vers
NOTY_INSTALLSLR_INVALIDGAME="Could not find Proton version for selected game, unable to install Steam Linux Runtime"
GUI_USEGAMESCOPEWSI="Enable USE_GAMESCOPE_WSI"
DESC_USEGAMESCOPEWSI="This can be useful for some HDR options and for some DXVK v2.3 vsync optimisations"
NOTY_SPECIALKINSTALLING="Installing SpecialK..."
1 change: 1 addition & 0 deletions lang/polish.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1206,3 +1206,4 @@ NOTY_INSTALLSLR_NOTOOLMANIFEST="No tool_manifest.vdf found for given Proton vers
NOTY_INSTALLSLR_INVALIDGAME="Could not find Proton version for selected game, unable to install Steam Linux Runtime"
GUI_USEGAMESCOPEWSI="Enable USE_GAMESCOPE_WSI"
DESC_USEGAMESCOPEWSI="This can be useful for some HDR options and for some DXVK v2.3 vsync optimisations"
NOTY_SPECIALKINSTALLING="Installing SpecialK..."
1 change: 1 addition & 0 deletions lang/russian.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1206,3 +1206,4 @@ NOTY_INSTALLSLR_NOTOOLMANIFEST="No tool_manifest.vdf found for given Proton vers
NOTY_INSTALLSLR_INVALIDGAME="Could not find Proton version for selected game, unable to install Steam Linux Runtime"
GUI_USEGAMESCOPEWSI="Enable USE_GAMESCOPE_WSI"
DESC_USEGAMESCOPEWSI="This can be useful for some HDR options and for some DXVK v2.3 vsync optimisations"
NOTY_SPECIALKINSTALLING="Installing SpecialK..."
27 changes: 6 additions & 21 deletions steamtinkerlaunch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
PREFIX="/usr"
PROGNAME="SteamTinkerLaunch"
NICEPROGNAME="Steam Tinker Launch"
PROGVERS="v14.0.20230907-1"
PROGVERS="v14.0.20230907-2"
PROGCMD="${0##*/}"
SHOSTL="stl"
GHURL="https://github.com"
Expand Down Expand Up @@ -237,7 +237,7 @@ TIGEMETA="$METADIR/title/general"
TICUMETA="$METADIR/title/custom"
DRC="drive_c"
DRCU="$DRC/users"
DRCW="$DRC/windows"
# DRCW="$DRC/windows"
STUS="steamuser"
PUBUS="Public"
SUBADIR="$STLBACKDIR/$STUS"
Expand Down Expand Up @@ -8966,6 +8966,7 @@ function dlSpecialK {
fi
}

# TODO does this need updated for when a game has multiple APIs? See #580
function getSpecialKGameRenderApi {
SPEKCOMP="$SPEKDLDIR/${SPEK}_compat.html"
MAXAGE=1440
Expand Down Expand Up @@ -9083,6 +9084,7 @@ function useSpecialK {
writelog "SKIP" "${FUNCNAME[0]} - Nothing to update - '$SPEKDST' corresponds to '$SPEKSRC'" "E"
else
writelog "INFO" "${FUNCNAME[0]} - Installing '${SPEKSRC##*/}' as '$GP' is $2-bit" "E"
notiShow "$NOTY_SPECIALKINSTALLING"
cp "$SPEKSRC" "$SPEKDST"
if [ -f "${SPEKSRC//dll/pdb}" ]; then
SPEKPDB="${SPEKSRC##*/}"
Expand All @@ -9092,16 +9094,6 @@ function useSpecialK {
echo "$SPEKDDIR/$SPEKPDB" >> "$SPEKENA"
fi
fi

# TODO this does not appear to be working!
IPAK="vcrun2022-$3"
if [ -f "$GPFX/${IPAK}_installed.txt" ]; then
writelog "SKIP" "${FUNCNAME[0]} - Skipping '$IPAK' - already installed" "E"
else
installSteWoShPak "$IPAK" "$GPFX" "$RUNWINE"
echo "$IPAK" > "$GPFX/${IPAK}_installed.txt"
fi
installd3d47dll "$4" "$SPEKDDIR"
}

function installSpekArchDll {
Expand Down Expand Up @@ -9142,16 +9134,8 @@ function useSpecialK {
dlSpecialK

getSpecialKGameRenderApi

writelog "INFO" "${FUNCNAME[0]} - Using '$SPEKDST' as $SPEK destination dll"

if [ -f "$GPFX/$DRCW/DirectX.log" ]; then
writelog "SKIP" "${FUNCNAME[0]} - Skipping 'dxsetup' - already installed" "E"
else
notiShow "$(strFix "$NOTY_INSTSTART" "dxsetup")"
installSteWoShPak "dxsetup" "$GPFX" "$RUNWINE"
notiShow "$(strFix "$NOTY_INSTSTOP" "dxsetup")"
fi
writelog "INFO" "${FUNCNAME[0]} - Using '$SPEKDST' as $SPEK destination dll"

echo "$SPEKDST" > "$SPEKENA"

Expand Down Expand Up @@ -13383,6 +13367,7 @@ function runExe {
fi
}

# Install Steamworks Shared Package (package name mapping can be found at eval/packages/<name>)
function installSteWoShPak {
AIDORPFX="$2"
if [ -n "$3" ]; then
Expand Down