mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Introjucer: file separator character fix on windows.

Browse source
This commit is contained in:
jules 2012-08-28 20:56:24 +01:00
parent de44f0a332
commit a4e87ef28a
3 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
extras/Introjucer/Source/Project/jucer_Project.cpp
View file

@ -293,13 +293,12 @@ File Project::resolveFilename (String filename) const
if (filename.isEmpty())
return File::nonexistent;
filename = replacePreprocessorDefs (getPreprocessorDefs(), filename)
.replaceCharacter ('\\', '/');
filename = replacePreprocessorDefs (getPreprocessorDefs(), filename);
if (FileHelpers::isAbsolutePath (filename))
return File::createFileWithoutCheckingPath (filename); // (avoid assertions for windows-style paths)
return File::createFileWithoutCheckingPath (FileHelpers::currentOSStylePath (filename)); // (avoid assertions for windows-style paths)
return getFile().getSiblingFile (filename);
return getFile().getSiblingFile (FileHelpers::currentOSStylePath (filename));
}
String Project::getRelativePathForFile (const File& file) const

14
extras/Introjucer/Source/Utility/jucer_FileHelpers.cpp
View file

@ -102,14 +102,16 @@ namespace FileHelpers
return false;
}
String unixStylePath (const String& path)
{
return path.replaceCharacter ('\\', '/');
}
String unixStylePath (const String& path) { return path.replaceCharacter ('\\', '/'); }
String windowsStylePath (const String& path) { return path.replaceCharacter ('/', '\\'); }
String windowsStylePath (const String& path)
String currentOSStylePath (const String& path)
{
return path.replaceCharacter ('/', '\\');
#if JUCE_WINDOWS
return windowsStylePath (path);
#else
return unixStylePath (path);
#endif
}
bool isAbsolutePath (const String& path)

1
extras/Introjucer/Source/Utility/jucer_FileHelpers.h
View file

@ -41,6 +41,7 @@ namespace FileHelpers
String unixStylePath (const String& path);
String windowsStylePath (const String& path);
String currentOSStylePath (const String& path);
bool shouldPathsBeRelative (String path1, String path2);
bool isAbsolutePath (const String& path);