1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-04-20 11:47:46 +00:00

Try to fix more DXVK launch issues

This commit is contained in:
Joshua Goins 2023-12-20 21:05:39 -05:00
parent b8fe2f7514
commit bd0db4a792

View file

@ -185,7 +185,7 @@ void GameRunner::launchExecutable(const Profile &profile, QProcess *process, con
const QDir windows = driveC.absoluteFilePath(QStringLiteral("windows")); const QDir windows = driveC.absoluteFilePath(QStringLiteral("windows"));
const QDir system32 = windows.absoluteFilePath(QStringLiteral("system32")); const QDir system32 = windows.absoluteFilePath(QStringLiteral("system32"));
for (const auto &entry : dxvk64Dir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot)) { for (const auto &entry : dxvk64Dir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot)) {
QFile::copy(entry.absoluteFilePath(), system32.absoluteFilePath(entry.fileName())); QFile::copy(entry.absoluteFilePath(), system32.absoluteFilePath(entry.fileName()));
} }
#endif #endif
@ -227,13 +227,14 @@ void GameRunner::launchExecutable(const Profile &profile, QProcess *process, con
const QString logDir = Utility::stateDirectory().absoluteFilePath(QStringLiteral("log")); const QString logDir = Utility::stateDirectory().absoluteFilePath(QStringLiteral("log"));
env.insert(QStringLiteral("DXVK_LOG_PATH"), logDir); env.insert(QStringLiteral("DXVK_LOG_PATH"), logDir);
env.insert(QStringLiteral("DXVK_HUD"), QStringLiteral("full"));
#endif #endif
#if defined(Q_OS_MAC) || defined(Q_OS_LINUX) #if defined(Q_OS_MAC) || defined(Q_OS_LINUX)
env.insert(QStringLiteral("WINEPREFIX"), profile.winePrefixPath()); env.insert(QStringLiteral("WINEPREFIX"), profile.winePrefixPath());
if (profile.wineType() == Profile::WineType::BuiltIn) { if (profile.wineType() == Profile::WineType::BuiltIn) {
env.insert(QStringLiteral("WINEDLLOVERRIDES"), QStringLiteral("d3d9,d3d11,d3d10core,dxgi=n")); env.insert(QStringLiteral("WINEDLLOVERRIDES"), QStringLiteral("msquic=,mscoree=n,b;d3d9,d3d11,d3d10core,dxgi=n,b"));
} }
arguments.push_back(profile.winePath()); arguments.push_back(profile.winePath());
@ -249,6 +250,9 @@ void GameRunner::launchExecutable(const Profile &profile, QProcess *process, con
process->setProcessEnvironment(env); process->setProcessEnvironment(env);
qInfo() << env.toStringList();
qInfo() << executable << arguments;
process->start(executable, arguments); process->start(executable, arguments);
} }