From 37e2fcbf6948d266dadd8a1a5ac29f9b8c11b9bc Mon Sep 17 00:00:00 2001 From: jules Date: Sun, 1 Feb 2015 18:46:52 +0000 Subject: [PATCH] Introjucer: Fix for makefile paths containing spaces. --- .../Introjucer/Source/Project Saving/jucer_ProjectExport_Make.h | 2 +- .../Introjucer/Source/Project Saving/jucer_ProjectExporter.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Make.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Make.h index 846a28fe44..c99ac8c653 100644 --- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Make.h +++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Make.h @@ -146,7 +146,7 @@ private: searchPaths.removeDuplicates (false); for (int i = 0; i < searchPaths.size(); ++i) - out << " -I " << addQuotesIfContainsSpaces (FileHelpers::unixStylePath (replacePreprocessorTokens (config, searchPaths[i]))); + out << " -I " << escapeSpaces (FileHelpers::unixStylePath (replacePreprocessorTokens (config, searchPaths[i]))); } void writeCppFlags (OutputStream& out, const BuildConfiguration& config) const diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.cpp b/extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.cpp index 03d1b63588..63c10cf0c8 100644 --- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.cpp +++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.cpp @@ -704,7 +704,7 @@ String ProjectExporter::BuildConfiguration::getGCCLibraryPathFlags() const const StringArray libraryPaths (getLibrarySearchPaths()); for (int i = 0; i < libraryPaths.size(); ++i) - s << " -L" << addQuotesIfContainsSpaces (libraryPaths[i]); + s << " -L" << escapeSpaces (libraryPaths[i]); return s; }