release: target GE-Proton10-34 with latest DXVK

scripts/common.sh

@@ -10,11 +10,11 @@ DXVK_CACHE_DIR="${DXVK_CACHE_DIR:-$CACHE_DIR/dxvk}"
 METADATA_DIR="${METADATA_DIR:-$DIST_DIR/metadata}"
 STEAM_COMPAT_DIR_DEFAULT="${STEAM_COMPAT_DIR_DEFAULT:-$HOME/.local/share/Steam/compatibilitytools.d}"
 UPSTREAM_REPO="${UPSTREAM_REPO:-GloriousEggroll/proton-ge-custom}"
-ELSWORD_GE_VERSION="${ELSWORD_GE_VERSION:-11-1}"
+ELSWORD_GE_VERSION="${ELSWORD_GE_VERSION:-10-34}"
 PROTON_TAG="${PROTON_TAG:-GE-Proton${ELSWORD_GE_VERSION}}"
 PROTON_ASSET="${PROTON_ASSET:-x86_64}"
 RUNTIME_APPID="${RUNTIME_APPID:-4183110}"
-WINE_SERIES="${WINE_SERIES:-Wine 11}"
+WINE_SERIES="${WINE_SERIES:-Wine 10}"
 DXVK_STABLE_TAG_DEFAULT="${DXVK_STABLE_TAG_DEFAULT:-latest}"
 DXVK_GIT_REF="${DXVK_GIT_REF:-origin/master}"
 MINGW_PTHREAD_ROOT="${MINGW_PTHREAD_ROOT:-}"
@@ -259,7 +259,7 @@ PY
 resolve_runtime_dll_path() {
   local arch="$1"
   local dll="$2"
-  local compiler result nix_attr store_path
+  local compiler result nix_attr store_path arch_dir
 
   case "$arch" in
     x86_64) compiler="x86_64-w64-mingw32-g++" ;;
@@ -275,9 +275,20 @@ resolve_runtime_dll_path() {
 
   if [[ "$dll" == "libmcfgthread-2.dll" ]]; then
     case "$arch" in
-      x86_64) nix_attr="pkgsCross.mingwW64.windows.mcfgthreads" ;;
-      x86) nix_attr="pkgsCross.mingw32.windows.mcfgthreads" ;;
+      x86_64)
+        nix_attr="pkgsCross.mingwW64.windows.mcfgthreads"
+        arch_dir="x64"
+        ;;
+      x86)
+        nix_attr="pkgsCross.mingw32.windows.mcfgthreads"
+        arch_dir="x32"
+        ;;
     esac
+    result="${MINGW_PTHREAD_ROOT:-}/$arch_dir/$dll"
+    if [[ -f "$result" ]]; then
+      printf "%s\n" "$result"
+      return 0
+    fi
     store_path="$(NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1 nix path-info --impure "nixpkgs#${nix_attr}")"
     result="$(find "$store_path" -name "$dll" -type f | head -n1 || true)"
     if [[ -n "$result" && -f "$result" ]]; then

scripts/install-to-steam.sh

@@ -7,8 +7,8 @@ STEAM_COMPAT_DIR="${STEAM_COMPAT_DIR:-$HOME/.local/share/Steam/compatibilitytool
 usage() {
   cat <<'EOF'
 Usage:
-  ./scripts/install-to-steam.sh dist/Elsword-GE-11-1.tar.zst
-  ./scripts/install-to-steam.sh dist/Elsword-GE-11-1+dxvk-git.tar.zst
+  ./scripts/install-to-steam.sh dist/Elsword-GE-10-34.tar.zst
+  ./scripts/install-to-steam.sh dist/Elsword-GE-10-34+dxvk-git.tar.zst
 EOF
 }
 

scripts/validate-build.sh

@@ -8,7 +8,7 @@ source "$SCRIPT_DIR/common.sh"
 usage() {
   cat <<'EOF'
 Usage:
-  ./scripts/validate-build.sh dist/Elsword-GE-11-1 Elsword-GE-11-1
+  ./scripts/validate-build.sh dist/Elsword-GE-10-34 Elsword-GE-10-34
 EOF
 }