7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2025-03-26 04:39:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't rely on filesystem current_path

Browse source
This commit is contained in:
altalk23 2023-05-01 14:47:25 +03:00
parent d60782fee1
commit dc96da012d
4 changed files with 18 additions and 12 deletions
loader
launcher/windows
Bootstrapper.cpp
src
loader
Dirs.cpp
platform
mac
util.mm
windows
util.cpp

6
loader/launcher/windows/Bootstrapper.cpp
View file

@ -17,7 +17,11 @@ int loadGeode(PVOID module) {
}
DWORD WINAPI load(PVOID module) {
auto workingDir = ghc::filesystem::current_path();
std::array<TCHAR, MAX_PATH> szFileName;
GetModuleFileName(NULL, szFileName.data(), MAX_PATH);
ghc::filesystem::path path(szFileName);
auto workingDir = path.parent_path();
auto updatesDir = workingDir / "geode" / "update";
auto resourcesDir = workingDir / "geode" / "resources";

2
loader/src/loader/Dirs.cpp
View file

@ -19,7 +19,7 @@ namespace {
}
ghc::filesystem::path dirs::getGameDir() {
return weaklyCanonical(CCFileUtils::sharedFileUtils()->getWritablePath2().c_str());
return utils::file::current_path();
}
ghc::filesystem::path dirs::getSaveDir() {

15
loader/src/platform/mac/util.mm
View file

@ -149,17 +149,14 @@ CCPoint cocos::getMousePos() {
}
ghc::filesystem::path utils::file::current_path() {
// if it's just a slash because for some reason it is
if (ghc::filesystem::current_path().string().size() < 2) {
std::array<char, PATH_MAX> gddir;
std::array<char, PATH_MAX> gddir;
uint32_t out = PATH_MAX;
_NSGetExecutablePath(gddir.data(), &out);
uint32_t out = PATH_MAX;
_NSGetExecutablePath(gddir.data(), &out);
ghc::filesystem::path gdpath = gddir.data();
ghc::filesystem::current_path(gdpath.parent_path().parent_path());
}
return ghc::filesystem::current_path();
ghc::filesystem::path gdpath = gddir.data();
auto currentPath = gdpath.parent_path().parent_path();
return currentPath;
}
#endif

7
loader/src/platform/windows/util.cpp
View file

@ -116,7 +116,12 @@ CCPoint cocos::getMousePos() {
}
ghc::filesystem::path utils::file::current_path() {
return ghc::filesystem::current_path();
std::array<TCHAR, MAX_PATH> szFileName;
GetModuleFileName(NULL, szFileName.data(), MAX_PATH);
ghc::filesystem::path path(szFileName);
auto currentPath = path.parent_path();
return currentPath;
}
#endif