AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 22:27:43 +00:00
Code Issues Projects Releases Wiki Activity

Fixes for GameCube targeting

Browse Source
This commit is contained in:
Jack Andersen
2018-03-27 22:06:34 -10:00
parent d1a66e15d4
commit c9f61eb9da
16 changed files with 148 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hecl/lib/ProjectPath.cpp
View File

@@ -14,9 +14,9 @@ static SystemString CanonRelPath(SystemStringView path)
hecl::SystemRegexMatch matches;
SystemString in(path);
SanitizePath(in);
for (; std::regex_search(in, matches, regPATHCOMP) ; in = matches.suffix())
for (; std::regex_search(in, matches, regPATHCOMP) ; in = matches.suffix().str())
{
const SystemString& match = matches[1];
hecl::SystemRegexMatch::const_reference match = matches[1];
if (!match.compare(_S(".")))
continue;
else if (!match.compare(_S("..")))
@@ -30,7 +30,7 @@ static SystemString CanonRelPath(SystemStringView path)
comps.pop_back();
continue;
}
comps.push_back(match);
comps.push_back(match.str());
}
/* Emit relative path */
@@ -210,7 +210,7 @@ static void _recursiveGlob(Database::Project& proj,
return;
if (S_ISDIR(theStat.st_mode))
_recursiveGlob(proj, outPaths, matches.suffix(), nextItStr, true);
_recursiveGlob(proj, outPaths, matches.suffix().str(), nextItStr, true);
else
outPaths.emplace_back(proj, nextItStr);
return;
@@ -235,7 +235,7 @@ static void _recursiveGlob(Database::Project& proj,
continue;
if (ent.m_isDir)
_recursiveGlob(proj, outPaths, matches.suffix(), nextItStr, true);
_recursiveGlob(proj, outPaths, matches.suffix().str(), nextItStr, true);
else
outPaths.emplace_back(proj, nextItStr);
}