thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Windows: Split out Create... from InitSysDirectories, fixup uses

Browse source
This commit is contained in:
Henrik Rydgård 2023-08-18 12:15:12 +02:00
parent 3f3c5edaff
commit 6f6ea4595a
6 changed files with 22 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Core/System.cpp
View file

@ -713,10 +713,9 @@ void InitSysDirectories() {
if (!g_Config.memStickDirectory.empty() && !g_Config.flash0Directory.empty())
return;
const Path &path = File::GetExeDirectory();
const Path &exePath = File::GetExeDirectory();
// Mount a filesystem
g_Config.flash0Directory = path / "assets/flash0";
g_Config.flash0Directory = exePath / "assets/flash0";
// Detect the "My Documents"(XP) or "Documents"(on Vista/7/8) folder.
#if PPSSPP_PLATFORM(UWP)
@ -726,7 +725,7 @@ void InitSysDirectories() {
// Caller sets this to the Documents folder.
const Path rootMyDocsPath = g_Config.internalDataDirectory;
const Path myDocsPath = rootMyDocsPath / "PPSSPP";
const Path installedFile = path / "installed.txt";
const Path installedFile = exePath / "installed.txt";
const bool installed = File::Exists(installedFile);
// If installed.txt exists(and we can determine the Documents directory)
@ -751,7 +750,7 @@ void InitSysDirectories() {
if (g_Config.memStickDirectory.empty())
g_Config.memStickDirectory = myDocsPath;
} else {
g_Config.memStickDirectory = path / "memstick";
g_Config.memStickDirectory = exePath / "memstick";
}
// Create the memstickpath before trying to write to it, and fall back on Documents yet again
@ -773,7 +772,10 @@ void InitSysDirectories() {
if (File::Exists(testFile))
File::Delete(testFile);
#endif
}
#endif
void CreateSysDirectories() {
// Create the default directories that a real PSP creates. Good for homebrew so they can
// expect a standard environment. Skipping THEME though, that's pointless.
File::CreateDir(GetSysDirectory(DIRECTORY_PSP));
@ -788,4 +790,3 @@ void InitSysDirectories() {
g_Config.currentDirectory = GetSysDirectory(DIRECTORY_GAME);
}
}
#endif