ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Config: Use directory containing bundle as AppRoot on macOS.

This commit is contained in:
squidbus 2024-08-10 18:55:29 -07:00 committed by Ty
parent 11096a520e
commit 185b85f86a
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pcsx2/Pcsx2Config.cpp
View File

@ -1,6 +1,7 @@
// SPDX-FileCopyrightText: 2002-2024 PCSX2 Dev Team // SPDX-FileCopyrightText: 2002-2024 PCSX2 Dev Team
// SPDX-License-Identifier: GPL-3.0+ // SPDX-License-Identifier: GPL-3.0+
#include "common/CocoaTools.h"
#include "common/FileSystem.h" #include "common/FileSystem.h"
#include "common/Path.h" #include "common/Path.h"
#include "common/SettingsInterface.h" #include "common/SettingsInterface.h"
@ -1859,7 +1860,15 @@ void Pcsx2Config::ClearInvalidPerGameConfiguration(SettingsInterface* si)
void EmuFolders::SetAppRoot() void EmuFolders::SetAppRoot()
{ {
const std::string program_path = FileSystem::GetProgramPath(); std::string program_path = FileSystem::GetProgramPath();
#ifdef __APPLE__
const auto bundle_path = CocoaTools::GetNonTranslocatedBundlePath();
if (bundle_path.has_value())
{
// On macOS, override with the bundle path if launched from a bundle.
program_path = bundle_path.value();
}
#endif
Console.WriteLnFmt("Program Path: {}", program_path); Console.WriteLnFmt("Program Path: {}", program_path);
AppRoot = Path::Canonicalize(Path::GetDirectory(program_path)); AppRoot = Path::Canonicalize(Path::GetDirectory(program_path));
@ -1879,7 +1888,8 @@ bool EmuFolders::SetResourcesDirectory()
#endif #endif
#else #else
// On macOS, this is in the bundle resources directory. // On macOS, this is in the bundle resources directory.
Resources = Path::Canonicalize(Path::Combine(AppRoot, "../Resources")); const std::string program_path = FileSystem::GetProgramPath();
Resources = Path::Canonicalize(Path::Combine(Path::GetDirectory(program_path), "../Resources"));
#endif #endif
Console.WriteLnFmt("Resources Directory: {}", Resources); Console.WriteLnFmt("Resources Directory: {}", Resources);