@@ -293,13 +293,12 @@ File Project::resolveFilename (String filename) const | |||||
if (filename.isEmpty()) | if (filename.isEmpty()) | ||||
return File::nonexistent; | return File::nonexistent; | ||||
filename = replacePreprocessorDefs (getPreprocessorDefs(), filename) | |||||
.replaceCharacter ('\\', '/'); | |||||
filename = replacePreprocessorDefs (getPreprocessorDefs(), filename); | |||||
if (FileHelpers::isAbsolutePath (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 | String Project::getRelativePathForFile (const File& file) const | ||||
@@ -102,14 +102,16 @@ namespace FileHelpers | |||||
return false; | 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) | bool isAbsolutePath (const String& path) | ||||
@@ -41,6 +41,7 @@ namespace FileHelpers | |||||
String unixStylePath (const String& path); | String unixStylePath (const String& path); | ||||
String windowsStylePath (const String& path); | String windowsStylePath (const String& path); | ||||
String currentOSStylePath (const String& path); | |||||
bool shouldPathsBeRelative (String path1, String path2); | bool shouldPathsBeRelative (String path1, String path2); | ||||
bool isAbsolutePath (const String& path); | bool isAbsolutePath (const String& path); | ||||