From c956b984c67f28fed2323f7908904aa7e523b726 Mon Sep 17 00:00:00 2001 From: ed Date: Fri, 29 Sep 2017 16:53:08 +0100 Subject: [PATCH] Projucer: Added a "Header search paths" field to the project settings page that will be used for all exporters --- extras/Projucer/Source/Project/jucer_Project.cpp | 2 ++ extras/Projucer/Source/Project/jucer_Project.h | 3 +++ extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/extras/Projucer/Source/Project/jucer_Project.cpp b/extras/Projucer/Source/Project/jucer_Project.cpp index 429888d51d..ed947d4522 100644 --- a/extras/Projucer/Source/Project/jucer_Project.cpp +++ b/extras/Projucer/Source/Project/jucer_Project.cpp @@ -749,6 +749,8 @@ void Project::createPropertyEditors (PropertyListBuilder& props) "Global preprocessor definitions. Use the form \"NAME1=value NAME2=value\", using whitespace, commas, or " "new-lines to separate the items - to include a space or comma in a definition, precede it with a backslash."); + props.addSearchPathProperty (getProjectHeaderSearchPaths(), "Header search paths", "Global header search paths."); + props.add (new TextPropertyComponent (getProjectUserNotes(), "Notes", 32768, true), "Extra comments: This field is not used for code or project generation, it's just a space where you can express your thoughts."); } diff --git a/extras/Projucer/Source/Project/jucer_Project.h b/extras/Projucer/Source/Project/jucer_Project.h index f1c2eb3d29..6ca9489e31 100644 --- a/extras/Projucer/Source/Project/jucer_Project.h +++ b/extras/Projucer/Source/Project/jucer_Project.h @@ -106,6 +106,9 @@ public: Value getProjectValue (const Identifier& name) { return projectRoot.getPropertyAsValue (name, getUndoManagerFor (projectRoot)); } var getProjectVar (const Identifier& name) const { return projectRoot.getProperty (name); } + Value getProjectHeaderSearchPaths() { return getProjectValue (Ids::headerPath); } + String getHeaderSearchPaths() const { return projectRoot [Ids::headerPath]; } + Value getProjectPreprocessorDefs() { return getProjectValue (Ids::defines); } StringPairArray getPreprocessorDefs() const; diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp index 1a340746bb..112149f348 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp @@ -926,7 +926,7 @@ StringPairArray ProjectExporter::BuildConfiguration::getUniquePreprocessorDefs() StringArray ProjectExporter::BuildConfiguration::getHeaderSearchPaths() const { - return getSearchPathsFromString (getHeaderSearchPathString()); + return getSearchPathsFromString (getHeaderSearchPathString() + ';' + project.getHeaderSearchPaths()); } StringArray ProjectExporter::BuildConfiguration::getLibrarySearchPaths() const