2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 21:07:42 +00:00

Windows fixes

This commit is contained in:
Jack Andersen
2015-10-11 18:38:49 -10:00
parent 60374a472a
commit bcd025f375
8 changed files with 26 additions and 20 deletions

View File

@@ -94,7 +94,7 @@ void ProjectPath::assign(Database::Project& project, const std::string& path)
{
m_proj = &project;
std::wstring wpath = UTF8ToWide(path);
m_relPath = canonRelPath(wpath);
m_relPath = CanonRelPath(wpath);
m_absPath = project.getProjectRootPath().getAbsolutePath() + _S('/') + m_relPath;
SanitizePath(m_relPath);
SanitizePath(m_absPath);
@@ -122,9 +122,9 @@ void ProjectPath::assign(const ProjectPath& parentPath, const SystemString& path
#if HECL_UCS2
void ProjectPath::assign(const ProjectPath& parentPath, const std::string& path)
{
m_projRoot = parentPath.m_projRoot;
m_proj = parentPath.m_proj;
std::wstring wpath = UTF8ToWide(path);
m_relPath = canonRelPath(parentPath.m_relPath + _S('/') + wpath);
m_relPath = CanonRelPath(parentPath.m_relPath + _S('/') + wpath);
m_absPath = m_proj->getProjectRootPath().getAbsolutePath() + _S('/') + m_relPath;
SanitizePath(m_relPath);
SanitizePath(m_absPath);