From 7a3e412cf223154a1a078ab1fc5e4cb438896d8c Mon Sep 17 00:00:00 2001 From: tpoole Date: Mon, 31 Jul 2017 09:34:09 +0100 Subject: [PATCH] Projucer: Fixed a bug in exporter tilda expansion --- .../Source/Project Saving/jucer_ProjectExport_XCode.h | 2 +- .../Projucer/Source/Project Saving/jucer_ProjectExporter.cpp | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/extras/Projucer/Source/Project Saving/jucer_ProjectExport_XCode.h b/extras/Projucer/Source/Project Saving/jucer_ProjectExport_XCode.h index b584334df2..d4ed4b0dad 100644 --- a/extras/Projucer/Source/Project Saving/jucer_ProjectExport_XCode.h +++ b/extras/Projucer/Source/Project Saving/jucer_ProjectExport_XCode.h @@ -2253,7 +2253,7 @@ private: v->setProperty ("isa", "PBXFileReference", nullptr); v->setProperty ("lastKnownFileType", fileType, nullptr); v->setProperty (Ids::name, pathString.fromLastOccurrenceOf ("/", false, false), nullptr); - v->setProperty ("path", sanitisePath (pathString), nullptr); + v->setProperty ("path", pathString, nullptr); v->setProperty ("sourceTree", sourceTree, nullptr); const int existing = pbxFileReferences.indexOfSorted (*this, v); diff --git a/extras/Projucer/Source/Project Saving/jucer_ProjectExporter.cpp b/extras/Projucer/Source/Project Saving/jucer_ProjectExporter.cpp index d74df52a12..13b1ed8c77 100644 --- a/extras/Projucer/Source/Project Saving/jucer_ProjectExporter.cpp +++ b/extras/Projucer/Source/Project Saving/jucer_ProjectExporter.cpp @@ -547,11 +547,6 @@ RelativePath ProjectExporter::getModuleFolderRelativeToProject (const String& mo if (path.isEmpty()) return getLegacyModulePath (moduleID).getChildFile (moduleID); - #if ! JUCE_WINDOWS - if (path.startsWith ("~")) - path = File::getSpecialLocation (File::userHomeDirectory).getChildFile (path.trimCharactersAtStart ("~/")).getFullPathName(); - #endif - return RelativePath (path, RelativePath::projectFolder).getChildFile (moduleID); }