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

Windows Fixes

This commit is contained in:
Jack Andersen 2016-09-18 15:02:57 -10:00
parent 6de25c1d1d
commit c1dcf6d23e
4 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hecl/extern/athena vendored

@ -1 +1 @@
Subproject commit d4d1bdabc680399123c19209d0162278764bda64
Subproject commit a2d040aeb4c70ad7b62eaa1669bc5cff94710eed

2
hecl/extern/boo vendored

@ -1 +1 @@
Subproject commit 46b1b84cfc6cfa4d7ae27fe7b2b0e8dfb398e866
Subproject commit 528c572671463cba7f1f7f03efbbcc76b70429e2

3
hecl/include/hecl/Backend/GX.hpp
View File

@ -7,6 +7,9 @@
#include <stdlib.h>
#include <algorithm>
#undef min
#undef max
namespace hecl
{
namespace Backend

20
hecl/include/hecl/hecl.hpp
View File

@ -1084,16 +1084,28 @@ public:
* @brief Construct a path with the aux info overwritten with specified string
* @param auxStr string to replace existing auxInfo with
*/
hecl::ProjectPath ensureAuxInfo(const SystemChar* auxStr) const
ProjectPath ensureAuxInfo(const SystemChar* auxStr) const
{
return hecl::ProjectPath(getProject(), getRelativePath() + _S('|') + auxStr);
return ProjectPath(getProject(), getRelativePath() + _S('|') + auxStr);
}
hecl::ProjectPath ensureAuxInfo(const SystemString& auxStr) const
ProjectPath ensureAuxInfo(const SystemString& auxStr) const
{
return ensureAuxInfo(auxStr.c_str());
return ProjectPath(getProject(), getRelativePath() + _S('|') + auxStr);
}
#if HECL_UCS2
ProjectPath ensureAuxInfo(const char* auxStr) const
{
return ProjectPath(getProject(), getRelativePath() + _S('|') + UTF8ToWide(auxStr));
}
ProjectPath ensureAuxInfo(const std::string& auxStr) const
{
return ProjectPath(getProject(), getRelativePath() + _S('|') + UTF8ToWide(auxStr));
}
#endif
/**
* @brief Type of path
*/