diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2024-06-17 13:33:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-17 13:33:23 +0200 |
| commit | ccd213c4a1ee3016c4184a9ce86ee1bd7472406d (patch) | |
| tree | cdc870beec978ee53f125320bf51924b36bede34 /proto-wine/proton.cpp | |
| parent | 788d478be6c363d151a9693b3b1d4e4eaa11c021 (diff) | |
| parent | 9fcb6b524b7c9d6937f88a4b9928a905d886df1d (diff) | |
Merge pull request #1867 from kzvezdarov/fix-proton-9x-exec-path
Diffstat (limited to 'proto-wine/proton.cpp')
| -rw-r--r-- | proto-wine/proton.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/proto-wine/proton.cpp b/proto-wine/proton.cpp index 5ecd1f93..868a4004 100644 --- a/proto-wine/proton.cpp +++ b/proto-wine/proton.cpp @@ -25,7 +25,7 @@ static const char* runtime_paths[] = { }; -std::tuple<QProcessEnvironment, QString, bool> make_steam_environ(const QString& proton_path, int appid) +std::tuple<QProcessEnvironment, QString, bool> make_steam_environ(const QString& proton_dist_path, int appid) { using ret = std::tuple<QProcessEnvironment, QString, bool>; auto env = QProcessEnvironment::systemEnvironment(); @@ -35,7 +35,7 @@ std::tuple<QProcessEnvironment, QString, bool> make_steam_environ(const QString& auto expand = [&](QString x) { x.replace("HOME", home); - x.replace("PROTON_PATH", proton_path); + x.replace("PROTON_DIST_PATH", proton_dist_path); x.replace("RUNTIME_PATH", runtime_path); return x; }; @@ -58,14 +58,14 @@ std::tuple<QProcessEnvironment, QString, bool> make_steam_environ(const QString& error = QString("Couldn't find a Wineprefix for AppId %1").arg(appid); QString path = expand( - ":PROTON_PATH/dist/bin" + ":PROTON_DIST_PATH/bin" ); path += ':'; path += qgetenv("PATH"); env.insert("PATH", path); QString library_path = expand( - ":PROTON_PATH/dist/lib" - ":PROTON_PATH/dist/lib64" + ":PROTON_DIST_PATH/lib" + ":PROTON_DIST_PATH/lib64" ":RUNTIME_PATH/pinned_libs_32" ":RUNTIME_PATH/pinned_libs_64" ":RUNTIME_PATH/i386/lib/i386-linux-gnu" @@ -84,9 +84,9 @@ std::tuple<QProcessEnvironment, QString, bool> make_steam_environ(const QString& return ret(env, error, error.isEmpty()); } -QString proton_path(const QString& proton_path) + +QString proton_path(const QString& proton_dist_path) { - return proton_path + "/dist/bin/wine"; + return proton_dist_path + "/bin/wine"; } - #endif |