redstrate/astra
1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-04-21 04:07:46 +00:00
Code Activity

Add Steam Proton support

Browse source
This commit is contained in:
Joshua Goins 2022-09-06 10:18:12 -04:00
parent 99e6e87a4d
commit 8dc37ed24b
2 changed files with 35 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
launcher/core/src/launchercore.cpp
View file

@ -128,7 +128,8 @@ void LauncherCore::beginDalamudGame(const QString& gameExecutablePath, const Pro
"--dalamud-plugin-directory=" + dataDir + "\\installedPlugins", "--dalamud-plugin-directory=" + dataDir + "\\installedPlugins",
"--dalamud-asset-directory=" + dataDir + "\\DalamudAssets", "--dalamud-asset-directory=" + dataDir + "\\DalamudAssets",
"--dalamud-client-language=" + QString::number(profile.language), "--dalamud-client-language=" + QString::number(profile.language),
"--", args}, "--",
args},
true, true,
true); true);
} }
@ -227,28 +228,43 @@ void LauncherCore::launchExecutable(
#endif #endif
#if defined(Q_OS_MAC) || defined(Q_OS_LINUX) #if defined(Q_OS_MAC) || defined(Q_OS_LINUX)
env.insert("WINEPREFIX", profile.winePrefixPath); if(isSteam) {
const QString steamDirectory = QProcessEnvironment::systemEnvironment().value("STEAM_COMPAT_CLIENT_INSTALL_PATH");
const QString compatData = steamDirectory + "/steamapps/compatdata/39210"; // TODO: do these have to exist on the root steam folder?
const QString protonPath = steamDirectory + "/steamapps/common/Proton 7.0";
// XIV on Mac bundle their own Wine install directory, complete with libs etc env.insert("PATH", protonPath + "/dist/bin:" + QProcessEnvironment::systemEnvironment().value("PATH"));
if (profile.wineType == WineType::XIVOnMac) { env.insert("WINEDLLPATH", protonPath + "/dist/lib64/wine:" + protonPath + "/dist/lib/wine");
// TODO: don't hardcode this env.insert("LD_LIBRARY_PATH", protonPath + "/dist/lib64:" + protonPath + "/dist/lib");
QString xivLibPath = "/Applications/XIV on Mac.app/Contents/Resources/wine/lib:/Applications/XIV on " env.insert("WINEPREFIX", compatData + "/pfx");
"Mac.app/Contents/Resources/MoltenVK/modern"; env.insert("STEAM_COMPAT_CLIENT_INSTALL_PATH", steamDirectory);
env.insert("STEAM_COMPAT_DATA_PATH", compatData);
env.insert("DYLD_FALLBACK_LIBRARY_PATH", xivLibPath); arguments.push_back(protonPath + "/proton");
env.insert("DYLD_VERSIONED_LIBRARY_PATH", xivLibPath); arguments.push_back("run");
env.insert("MVK_CONFIG_FULL_IMAGE_VIEW_SWIZZLE", "1"); } else {
env.insert("MVK_CONFIG_RESUME_LOST_DEVICE", "1"); env.insert("WINEPREFIX", profile.winePrefixPath);
env.insert("MVK_ALLOW_METAL_FENCES", "1");
env.insert("MVK_CONFIG_USE_METAL_ARGUMENT_BUFFERS", "1"); // XIV on Mac bundle their own Wine install directory, complete with libs etc
} if (profile.wineType == WineType::XIVOnMac) {
// TODO: don't hardcode this
QString xivLibPath = "/Applications/XIV on Mac.app/Contents/Resources/wine/lib:/Applications/XIV on "
"Mac.app/Contents/Resources/MoltenVK/modern";
env.insert("DYLD_FALLBACK_LIBRARY_PATH", xivLibPath);
env.insert("DYLD_VERSIONED_LIBRARY_PATH", xivLibPath);
env.insert("MVK_CONFIG_FULL_IMAGE_VIEW_SWIZZLE", "1");
env.insert("MVK_CONFIG_RESUME_LOST_DEVICE", "1");
env.insert("MVK_ALLOW_METAL_FENCES", "1");
env.insert("MVK_CONFIG_USE_METAL_ARGUMENT_BUFFERS", "1");
}
#if defined(FLATPAK) #if defined(FLATPAK)
arguments.push_back("flatpak-spawn"); arguments.push_back("flatpak-spawn");
arguments.push_back("--host"); arguments.push_back("--host");
#endif #endif
arguments.push_back(profile.winePath);
arguments.push_back(profile.winePath); }
#endif #endif
arguments.append(args); arguments.append(args);

2
launcher/main.cpp
View file

@ -73,7 +73,7 @@ int main(int argc, char* argv[]) {
for(auto& argument : QCoreApplication::arguments()) { for(auto& argument : QCoreApplication::arguments()) {
if(argument.contains("iscriptevaluator")) { if(argument.contains("iscriptevaluator")) {
return 0; //return 0;
} }
} }
} }