mo2/mob
0
0
Fork 0
mirror of https://github.com/ModOrganizer2/mob.git synced 2026-07-27 14:07:05 -07:00
Code Issues Packages Projects Releases Wiki Activity

be more careful when looking the root directory from the build directory, don't just blindly look up, check for actual names

Browse Source
This commit is contained in:
isanae
2020-05-25 03:17:14 -04:00
parent 099a3368d3
commit 66b70810e4
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/conf.cpp
+22 -6
View File
@@ -361,16 +361,32 @@ fs::path find_root()
{
gcx().trace(context::conf, "looking for root directory");
fs::path p = mob_exe_path().parent_path();
fs::path mob_exe_dir = mob_exe_path().parent_path();
if (try_parts(p, {"..", "..", "..", "third-party"}))
auto third_party = mob_exe_dir / "third-party";
if (!fs::exists(third_party))
{
p = fs::canonical(p.parent_path());
gcx().trace(context::conf, "found root directory at {}", p);
return p;
auto p = mob_exe_dir;
if (p.filename().u8string() == u8"x64")
{
p = p.parent_path();
if (p.filename().u8string() == u8"Debug" ||
p.filename().u8string() == u8"Release")
{
// mob_exe_dir is in the build folder
third_party = mob_exe_dir / ".." / ".." / ".." / "third-party";
}
}
}
gcx().bail_out(context::conf, "root directory not found");
if (!fs::exists(third_party))
gcx().bail_out(context::conf, "root directory not found");
const auto p = fs::canonical(third_party.parent_path());
gcx().trace(context::conf, "found root directory at {}", p);
return p;
}
fs::path find_in_root(const fs::path& file)