AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor improvements

This commit is contained in:
Jack Andersen 2017-10-25 19:37:15 -10:00
parent b7208bfc5f
commit 5e99ee1d95
4 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hecl/driver/ToolBase.hpp
View File

@ -260,6 +260,8 @@ static hecl::SystemString MakePathArgAbsolute(const hecl::SystemString& arg,
#else #else
if (arg[0] == _S('/') || arg[0] == _S('\\')) if (arg[0] == _S('/') || arg[0] == _S('\\'))
return arg; return arg;
if (cwd.back() == _S('/') || cwd.back() == _S('\\'))
return cwd + arg;
return cwd + _S('/') + arg; return cwd + _S('/') + arg;
#endif #endif
} }

1
hecl/include/hecl/hecl.hpp
View File

@ -503,6 +503,7 @@ public:
uint32_t toUint32() const {return num;} uint32_t toUint32() const {return num;}
operator uint32_t() const {return num;} operator uint32_t() const {return num;}
const char* getChars() const {return fcc;} const char* getChars() const {return fcc;}
char* getChars() {return fcc;}
}; };
#define FOURCC(chars) FourCC(SBIG(chars)) #define FOURCC(chars) FourCC(SBIG(chars))

2
hecl/lib/ProjectPath.cpp
View File

@ -323,6 +323,8 @@ ProjectRootPath SearchForProject(const SystemString& path, SystemString& subpath
SystemString::const_iterator origEnd = testRoot.getAbsolutePath().end(); SystemString::const_iterator origEnd = testRoot.getAbsolutePath().end();
while (end != origEnd && *end != _S('/') && *end != _S('\\')) while (end != origEnd && *end != _S('/') && *end != _S('\\'))
++end; ++end;
if (*end == _S('/') || *end == _S('\\'))
++end;
subpathOut.assign(end, origEnd); subpathOut.assign(end, origEnd);
return newRootPath; return newRootPath;
} }

2
hecl/lib/hecl.cpp
View File

@ -215,6 +215,8 @@ bool IsPathBlend(const hecl::ProjectPath& path)
bool IsPathYAML(const hecl::ProjectPath& path) bool IsPathYAML(const hecl::ProjectPath& path)
{ {
if (!hecl::StrCmp(path.getLastComponent(), _S("!catalog.yaml")))
return false; /* !catalog.yaml is exempt from general use */
const SystemChar* lastCompExt = path.getLastComponentExt(); const SystemChar* lastCompExt = path.getLastComponentExt();
if (!lastCompExt) if (!lastCompExt)
return false; return false;