From 7484ac3dd3166040cef5e1bf26dd1db6841f6532 Mon Sep 17 00:00:00 2001 From: ed Date: Tue, 21 Jan 2020 16:25:33 +0000 Subject: [PATCH] Projucer: Updated all project templates to use include search path when including JuceHeader.h --- extras/Projucer/JuceLibraryCode/BinaryData.cpp | 8 ++++---- extras/Projucer/JuceLibraryCode/BinaryData.h | 4 ++-- .../BinaryData/Templates/jucer_ComponentTemplate.h | 2 +- .../Source/BinaryData/Templates/jucer_PIPMain.cpp | 2 +- .../Source/ComponentEditor/jucer_GeneratedCode.cpp | 12 +++--------- .../Source/ComponentEditor/jucer_GeneratedCode.h | 6 +----- .../Source/ComponentEditor/jucer_JucerDocument.cpp | 7 ++----- extras/Projucer/Source/Project/jucer_Project.h | 5 ++--- .../Source/ProjectSaving/jucer_ProjectSaver.h | 10 +++++----- .../Source/Utility/Helpers/jucer_CodeHelpers.cpp | 5 +++++ .../Source/Utility/Helpers/jucer_CodeHelpers.h | 4 +++- .../Source/Utility/PIPs/jucer_PIPGenerator.cpp | 14 ++++++++++---- .../Source/Wizards/jucer_NewFileWizard.cpp | 2 +- .../Source/Wizards/jucer_ProjectWizard_Animated.h | 9 ++++----- .../Source/Wizards/jucer_ProjectWizard_AudioApp.h | 9 ++++----- .../Wizards/jucer_ProjectWizard_AudioPlugin.h | 6 +++--- .../Source/Wizards/jucer_ProjectWizard_Console.h | 3 +-- .../Source/Wizards/jucer_ProjectWizard_GUIApp.h | 7 ++++--- .../Source/Wizards/jucer_ProjectWizard_openGL.h | 9 ++++----- 19 files changed, 60 insertions(+), 64 deletions(-) diff --git a/extras/Projucer/JuceLibraryCode/BinaryData.cpp b/extras/Projucer/JuceLibraryCode/BinaryData.cpp index dbebab8c6e..096299a5e9 100644 --- a/extras/Projucer/JuceLibraryCode/BinaryData.cpp +++ b/extras/Projucer/JuceLibraryCode/BinaryData.cpp @@ -6174,7 +6174,7 @@ static const unsigned char temp_binary_data_35[] = "#pragma once\r\n" "\r\n" "//[Headers] -- You can add your own extra header files here --\r\n" -"%%include_juce_header%%\r\n" +"%%include_juce%%\r\n" "//[/Headers]\r\n" "\r\n" "%%include_files_h%%\r\n" @@ -7204,7 +7204,7 @@ static const unsigned char temp_binary_data_53[] = " ==============================================================================\r\n" "*/\r\n" "\r\n" -"#include \"../JuceLibraryCode/JuceHeader.h\"\r\n" +"%%include_juce%%\r\n" "#include \"%%filename%%\"\r\n" "\r\n" "%%component_begin%%\r\n" @@ -7846,7 +7846,7 @@ const char* getNamedResource (const char* resourceNameUTF8, int& numBytes) case 0x51b49ac5: numBytes = 6036; return jucer_AudioPluginFilterTemplate_cpp; case 0x488afa0a: numBytes = 2272; return jucer_AudioPluginFilterTemplate_h; case 0xabad7041: numBytes = 2126; return jucer_ComponentTemplate_cpp; - case 0xfc72fe86: numBytes = 2051; return jucer_ComponentTemplate_h; + case 0xfc72fe86: numBytes = 2044; return jucer_ComponentTemplate_h; case 0x1657b643: numBytes = 1693; return jucer_ContentCompSimpleTemplate_h; case 0x0b66646c: numBytes = 1190; return jucer_ContentCompTemplate_cpp; case 0x6fa10171: numBytes = 1071; return jucer_ContentCompTemplate_h; @@ -7864,7 +7864,7 @@ const char* getNamedResource (const char* resourceNameUTF8, int& numBytes) case 0x7fbac252: numBytes = 1665; return jucer_OpenGLComponentTemplate_cpp; case 0x491fa0d7: numBytes = 1263; return jucer_OpenGLComponentTemplate_h; case 0xbc050edc: numBytes = 4926; return jucer_PIPAudioProcessorTemplate_h; - case 0xf4ca9e9a: numBytes = 2447; return jucer_PIPMain_cpp; + case 0xf4ca9e9a: numBytes = 2421; return jucer_PIPMain_cpp; case 0x0b16e320: numBytes = 517; return jucer_PIPTemplate_h; case 0xcd472557: numBytes = 6433; return jucer_UnityPluginGUIScript_cs; case 0x763d39dc: numBytes = 1050; return colourscheme_dark_xml; diff --git a/extras/Projucer/JuceLibraryCode/BinaryData.h b/extras/Projucer/JuceLibraryCode/BinaryData.h index d9311d3671..474d506e9b 100644 --- a/extras/Projucer/JuceLibraryCode/BinaryData.h +++ b/extras/Projucer/JuceLibraryCode/BinaryData.h @@ -114,7 +114,7 @@ namespace BinaryData const int jucer_ComponentTemplate_cppSize = 2126; extern const char* jucer_ComponentTemplate_h; - const int jucer_ComponentTemplate_hSize = 2051; + const int jucer_ComponentTemplate_hSize = 2044; extern const char* jucer_ContentCompSimpleTemplate_h; const int jucer_ContentCompSimpleTemplate_hSize = 1693; @@ -168,7 +168,7 @@ namespace BinaryData const int jucer_PIPAudioProcessorTemplate_hSize = 4926; extern const char* jucer_PIPMain_cpp; - const int jucer_PIPMain_cppSize = 2447; + const int jucer_PIPMain_cppSize = 2421; extern const char* jucer_PIPTemplate_h; const int jucer_PIPTemplate_hSize = 517; diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_ComponentTemplate.h b/extras/Projucer/Source/BinaryData/Templates/jucer_ComponentTemplate.h index 780bdc624b..ffaafbfcb1 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_ComponentTemplate.h +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_ComponentTemplate.h @@ -20,7 +20,7 @@ #pragma once //[Headers] -- You can add your own extra header files here -- -%%include_juce_header%% +%%include_juce%% //[/Headers] %%include_files_h%% diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_PIPMain.cpp b/extras/Projucer/Source/BinaryData/Templates/jucer_PIPMain.cpp index c26a2d0465..da0677bdd1 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_PIPMain.cpp +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_PIPMain.cpp @@ -6,7 +6,7 @@ ============================================================================== */ -#include "../JuceLibraryCode/JuceHeader.h" +%%include_juce%% #include "%%filename%%" %%component_begin%% diff --git a/extras/Projucer/Source/ComponentEditor/jucer_GeneratedCode.cpp b/extras/Projucer/Source/ComponentEditor/jucer_GeneratedCode.cpp index 0b43f9eef9..a63a13fe9d 100644 --- a/extras/Projucer/Source/ComponentEditor/jucer_GeneratedCode.cpp +++ b/extras/Projucer/Source/ComponentEditor/jucer_GeneratedCode.cpp @@ -319,10 +319,7 @@ static void copyAcrossUserSections (String& dest, const String& src) } //============================================================================== -void GeneratedCode::applyToCode (String& code, - const File& targetFile, - const String& oldFileWithUserData, - Project* project) const +void GeneratedCode::applyToCode (String& code, const File& targetFile, const String& oldFileWithUserData) const { replaceTemplate (code, "version", JUCEApplicationBase::getInstance()->getApplicationVersion()); replaceTemplate (code, "creationTime", Time::getCurrentTime().toString (true, true, true)); @@ -337,11 +334,8 @@ void GeneratedCode::applyToCode (String& code, replaceTemplate (code, "method_definitions", getCallbackDefinitions()); - File juceHeaderFile = project != nullptr ? project->getAppIncludeFile() - : targetFile.getSiblingFile ("JuceHeader.h"); - - replaceTemplate (code, "include_juce_header", CodeHelpers::createIncludeStatement (juceHeaderFile, targetFile)); - + replaceTemplate (code, "include_juce", CodeHelpers::createIncludePathIncludeStatement (Project::getJuceSourceHFilename())); + replaceTemplate (code, "include_files_h", getIncludeFileCode (includeFilesH, targetFile)); replaceTemplate (code, "include_files_cpp", getIncludeFileCode (includeFilesCPP, targetFile)); diff --git a/extras/Projucer/Source/ComponentEditor/jucer_GeneratedCode.h b/extras/Projucer/Source/ComponentEditor/jucer_GeneratedCode.h index a7e84f25a0..5f62f35dd0 100644 --- a/extras/Projucer/Source/ComponentEditor/jucer_GeneratedCode.h +++ b/extras/Projucer/Source/ComponentEditor/jucer_GeneratedCode.h @@ -41,11 +41,7 @@ public: ~GeneratedCode(); //============================================================================== - void applyToCode (String& code, - const File& targetFile, - const String& oldFileWithUserData, - Project* project) const; - + void applyToCode (String& code, const File& targetFile, const String& oldFileWithUserData) const; int getUniqueSuffix(); //============================================================================== diff --git a/extras/Projucer/Source/ComponentEditor/jucer_JucerDocument.cpp b/extras/Projucer/Source/ComponentEditor/jucer_JucerDocument.cpp index dea80bcde3..ad1e8a8e9f 100644 --- a/extras/Projucer/Source/ComponentEditor/jucer_JucerDocument.cpp +++ b/extras/Projucer/Source/ComponentEditor/jucer_JucerDocument.cpp @@ -532,11 +532,8 @@ bool JucerDocument::flushChangesToDocuments (Project* project, bool isInitial) String existingHeader (header->getCodeDocument().getAllContent()); String existingCpp (cpp->getCodeDocument().getAllContent()); - generated.applyToCode (headerTemplate, headerFile, - existingHeader, project); - - generated.applyToCode (cppTemplate, headerFile.withFileExtension (".cpp"), - existingCpp, project); + generated.applyToCode (headerTemplate, headerFile, existingHeader); + generated.applyToCode (cppTemplate, headerFile.withFileExtension (".cpp"), existingCpp); if (isInitial) { diff --git a/extras/Projucer/Source/Project/jucer_Project.h b/extras/Projucer/Source/Project/jucer_Project.h index 16b8be9d87..533e7e474c 100644 --- a/extras/Projucer/Source/Project/jucer_Project.h +++ b/extras/Projucer/Source/Project/jucer_Project.h @@ -67,9 +67,8 @@ public: File getBinaryDataCppFile (int index) const; File getBinaryDataHeaderFile() const { return getBinaryDataCppFile (0).withFileExtension (".h"); } - String getAppConfigFilename() const { return "AppConfig.h"; } - String getJuceSourceFilenameRoot() const { return "JuceLibraryCode"; } - String getJuceSourceHFilename() const { return "JuceHeader.h"; } + static String getAppConfigFilename() { return "AppConfig.h"; } + static String getJuceSourceHFilename() { return "JuceHeader.h"; } //============================================================================== template diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectSaver.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectSaver.h index 57577a5336..748cf563ab 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectSaver.h +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectSaver.h @@ -348,7 +348,7 @@ private: return longest; } - File getAppConfigFile() const { return generatedCodeFolder.getChildFile (project.getAppConfigFilename()); } + File getAppConfigFile() const { return generatedCodeFolder.getChildFile (Project::getAppConfigFilename()); } String loadUserContentFromAppConfig() const { @@ -525,7 +525,7 @@ private: mem.setNewLineString (projectLineFeed); writeAppConfig (mem, modules, userContent); - saveGeneratedFile (project.getAppConfigFilename(), mem); + saveGeneratedFile (Project::getAppConfigFilename(), mem); } void writeAppHeader (MemoryOutputStream& out, const OwnedArray& modules) @@ -542,7 +542,7 @@ private: out << "#pragma once" << newLine << newLine; if (appConfigFile.exists()) - out << CodeHelpers::createIncludeStatement (project.getAppConfigFilename()) << newLine; + out << CodeHelpers::createIncludeStatement (Project::getAppConfigFilename()) << newLine; if (modules.size() > 0) { @@ -590,7 +590,7 @@ private: mem.setNewLineString (projectLineFeed); writeAppHeader (mem, modules); - saveGeneratedFile (project.getJuceSourceHFilename(), mem); + saveGeneratedFile (Project::getJuceSourceHFilename(), mem); } void writeModuleCppWrappers (const OwnedArray& modules) @@ -606,7 +606,7 @@ private: mem << "*/" << newLine << newLine - << "#include " << project.getAppConfigFilename().quoted() << newLine + << "#include " << Project::getAppConfigFilename().quoted() << newLine << "#include <"; if (cu.file.getFileExtension() != ".r") // .r files are included without the path diff --git a/extras/Projucer/Source/Utility/Helpers/jucer_CodeHelpers.cpp b/extras/Projucer/Source/Utility/Helpers/jucer_CodeHelpers.cpp index bf7af246f3..18a1a7990b 100644 --- a/extras/Projucer/Source/Utility/Helpers/jucer_CodeHelpers.cpp +++ b/extras/Projucer/Source/Utility/Helpers/jucer_CodeHelpers.cpp @@ -135,6 +135,11 @@ namespace CodeHelpers return "#include \"" + includePath + "\""; } + String createIncludePathIncludeStatement (const String& includedFilename) + { + return "#include <" + includedFilename + ">"; + } + String makeBinaryDataIdentifierName (const File& file) { return makeValidIdentifier (file.getFileName() diff --git a/extras/Projucer/Source/Utility/Helpers/jucer_CodeHelpers.h b/extras/Projucer/Source/Utility/Helpers/jucer_CodeHelpers.h index d348f8367a..5947e083ec 100644 --- a/extras/Projucer/Source/Utility/Helpers/jucer_CodeHelpers.h +++ b/extras/Projucer/Source/Utility/Helpers/jucer_CodeHelpers.h @@ -34,9 +34,11 @@ namespace CodeHelpers String unindent (const String& code, int numSpaces); String makeValidIdentifier (String s, bool capitalise, bool removeColons, bool allowTemplates, bool allowAsterisks = false); + String makeBinaryDataIdentifierName (const File& file); + String createIncludeStatement (const File& includedFile, const File& targetFile); String createIncludeStatement (const String& includePath); - String makeBinaryDataIdentifierName (const File& file); + String createIncludePathIncludeStatement (const String& includedFilename); String stringLiteral (const String& text, int maxLineLength = -1); String floatLiteral (double value, int numDecPlaces); diff --git a/extras/Projucer/Source/Utility/PIPs/jucer_PIPGenerator.cpp b/extras/Projucer/Source/Utility/PIPs/jucer_PIPGenerator.cpp index 483ad06dd6..6e219fe661 100644 --- a/extras/Projucer/Source/Utility/PIPs/jucer_PIPGenerator.cpp +++ b/extras/Projucer/Source/Utility/PIPs/jucer_PIPGenerator.cpp @@ -425,10 +425,16 @@ String PIPGenerator::getMainFileTextForType() { String mainTemplate (BinaryData::jucer_PIPMain_cpp); - mainTemplate = mainTemplate.replace ("%%filename%%", useLocalCopy ? pipFile.getFileName() - : isTemp ? pipFile.getFullPathName() - : RelativePath (pipFile, outputDirectory.getChildFile ("Source"), - RelativePath::unknown).toUnixStyle()); + auto includeFilename = [&] + { + if (useLocalCopy) return pipFile.getFileName(); + if (isTemp) return pipFile.getFullPathName(); + + return RelativePath (pipFile, outputDirectory.getChildFile ("Source"), RelativePath::unknown).toUnixStyle(); + }(); + + mainTemplate = mainTemplate.replace ("%%filename%%", includeFilename) + .replace ("%%include_juce%%", CodeHelpers::createIncludePathIncludeStatement (Project::getJuceSourceHFilename())); auto type = metadata[Ids::type].toString(); diff --git a/extras/Projucer/Source/Wizards/jucer_NewFileWizard.cpp b/extras/Projucer/Source/Wizards/jucer_NewFileWizard.cpp index 70a84940d7..831430036b 100644 --- a/extras/Projucer/Source/Wizards/jucer_NewFileWizard.cpp +++ b/extras/Projucer/Source/Wizards/jucer_NewFileWizard.cpp @@ -170,7 +170,7 @@ public: { auto content = fillInBasicTemplateFields (newFile, parent, templateName) .replace ("%%component_class%%", className) - .replace ("%%include_juce%%", CodeHelpers::createIncludeStatement (parent.project.getAppIncludeFile(), newFile)); + .replace ("%%include_juce%%", CodeHelpers::createIncludePathIncludeStatement (Project::getJuceSourceHFilename())); content = replaceLineFeeds (content, parent.project.getProjectLineFeed()); diff --git a/extras/Projucer/Source/Wizards/jucer_ProjectWizard_Animated.h b/extras/Projucer/Source/Wizards/jucer_ProjectWizard_Animated.h index 6988b26baf..5dbd0d388a 100644 --- a/extras/Projucer/Source/Wizards/jucer_ProjectWizard_Animated.h +++ b/extras/Projucer/Source/Wizards/jucer_ProjectWizard_Animated.h @@ -71,14 +71,13 @@ struct AnimatedAppWizard : public NewProjectWizard setExecutableNameForAllTargets (project, File::createLegalFileName (appTitle)); - String appHeaders (CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), mainCppFile)); + auto juceHeaderInclude = CodeHelpers::createIncludePathIncludeStatement (Project::getJuceSourceHFilename()); + auto appHeaders = juceHeaderInclude + newLine + CodeHelpers::createIncludeStatement (contentCompH, mainCppFile); // create main window - appHeaders << newLine << CodeHelpers::createIncludeStatement (contentCompH, mainCppFile); - String windowH = project.getFileTemplate (createCppFile ? "jucer_AnimatedComponentTemplate_h" : "jucer_AnimatedComponentSimpleTemplate_h") - .replace ("%%include_juce%%", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), contentCompH), false) + .replace ("%%include_juce%%", juceHeaderInclude) .replace ("%%content_component_class%%", contentCompName, false); if (! FileHelpers::overwriteFileWithNewDataIfDifferent (contentCompH, windowH)) @@ -89,7 +88,7 @@ struct AnimatedAppWizard : public NewProjectWizard if (createCppFile) { String windowCpp = project.getFileTemplate ("jucer_AnimatedComponentTemplate_cpp") - .replace ("%%include_juce%%", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), contentCompCpp), false) + .replace ("%%include_juce%%", juceHeaderInclude) .replace ("%%include_corresponding_header%%", CodeHelpers::createIncludeStatement (contentCompH, contentCompCpp), false) .replace ("%%content_component_class%%", contentCompName, false); diff --git a/extras/Projucer/Source/Wizards/jucer_ProjectWizard_AudioApp.h b/extras/Projucer/Source/Wizards/jucer_ProjectWizard_AudioApp.h index 80aa745f1d..45eed35783 100644 --- a/extras/Projucer/Source/Wizards/jucer_ProjectWizard_AudioApp.h +++ b/extras/Projucer/Source/Wizards/jucer_ProjectWizard_AudioApp.h @@ -71,14 +71,13 @@ struct AudioAppWizard : public NewProjectWizard setExecutableNameForAllTargets (project, File::createLegalFileName (appTitle)); - String appHeaders (CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), mainCppFile)); + auto juceHeaderInclude = CodeHelpers::createIncludePathIncludeStatement (Project::getJuceSourceHFilename()); + auto appHeaders = juceHeaderInclude + newLine + CodeHelpers::createIncludeStatement (contentCompH, mainCppFile); // create main window - appHeaders << newLine << CodeHelpers::createIncludeStatement (contentCompH, mainCppFile); - String windowH = project.getFileTemplate (createCppFile ? "jucer_AudioComponentTemplate_h" : "jucer_AudioComponentSimpleTemplate_h") - .replace ("%%include_juce%%", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), contentCompH), false) + .replace ("%%include_juce%%", juceHeaderInclude) .replace ("%%content_component_class%%", contentCompName, false); if (! FileHelpers::overwriteFileWithNewDataIfDifferent (contentCompH, windowH)) @@ -89,7 +88,7 @@ struct AudioAppWizard : public NewProjectWizard if (createCppFile) { String windowCpp = project.getFileTemplate ("jucer_AudioComponentTemplate_cpp") - .replace ("%%include_juce%%", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), contentCompCpp), false) + .replace ("%%include_juce%%", juceHeaderInclude) .replace ("%%include_corresponding_header%%", CodeHelpers::createIncludeStatement (contentCompH, contentCompCpp), false) .replace ("%%content_component_class%%", contentCompName, false); diff --git a/extras/Projucer/Source/Wizards/jucer_ProjectWizard_AudioPlugin.h b/extras/Projucer/Source/Wizards/jucer_ProjectWizard_AudioPlugin.h index b81d28744c..767efd83ad 100644 --- a/extras/Projucer/Source/Wizards/jucer_ProjectWizard_AudioPlugin.h +++ b/extras/Projucer/Source/Wizards/jucer_ProjectWizard_AudioPlugin.h @@ -62,7 +62,7 @@ struct AudioPluginAppWizard : public NewProjectWizard setExecutableNameForAllTargets (project, File::createLegalFileName (appTitle)); - String appHeaders (CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), filterCppFile)); + auto juceHeaderInclude = CodeHelpers::createIncludePathIncludeStatement (Project::getJuceSourceHFilename()); String filterCpp = project.getFileTemplate ("jucer_AudioPluginFilterTemplate_cpp") .replace ("%%filter_headers%%", CodeHelpers::createIncludeStatement (filterHFile, filterCppFile) @@ -71,7 +71,7 @@ struct AudioPluginAppWizard : public NewProjectWizard .replace ("%%editor_class_name%%", editorClassName, false); String filterH = project.getFileTemplate ("jucer_AudioPluginFilterTemplate_h") - .replace ("%%app_headers%%", appHeaders, false) + .replace ("%%app_headers%%", juceHeaderInclude, false) .replace ("%%filter_class_name%%", filterClassName, false); String editorCpp = project.getFileTemplate ("jucer_AudioPluginEditorTemplate_cpp") @@ -81,7 +81,7 @@ struct AudioPluginAppWizard : public NewProjectWizard .replace ("%%editor_class_name%%", editorClassName, false); String editorH = project.getFileTemplate ("jucer_AudioPluginEditorTemplate_h") - .replace ("%%editor_headers%%", appHeaders + newLine + CodeHelpers::createIncludeStatement (filterHFile, filterCppFile), false) + .replace ("%%editor_headers%%", juceHeaderInclude + newLine + CodeHelpers::createIncludeStatement (filterHFile, filterCppFile), false) .replace ("%%filter_class_name%%", filterClassName, false) .replace ("%%editor_class_name%%", editorClassName, false); diff --git a/extras/Projucer/Source/Wizards/jucer_ProjectWizard_Console.h b/extras/Projucer/Source/Wizards/jucer_ProjectWizard_Console.h index 277bd8b081..3aba175c8b 100644 --- a/extras/Projucer/Source/Wizards/jucer_ProjectWizard_Console.h +++ b/extras/Projucer/Source/Wizards/jucer_ProjectWizard_Console.h @@ -69,10 +69,9 @@ struct ConsoleAppWizard : public NewProjectWizard if (createMainCpp) { File mainCppFile = getSourceFilesFolder().getChildFile ("Main.cpp"); - String appHeaders (CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), mainCppFile)); String mainCpp = project.getFileTemplate ("jucer_MainConsoleAppTemplate_cpp") - .replace ("%%app_headers%%", appHeaders, false); + .replace ("%%app_headers%%", CodeHelpers::createIncludePathIncludeStatement (Project::getJuceSourceHFilename()), false); if (! FileHelpers::overwriteFileWithNewDataIfDifferent (mainCppFile, mainCpp)) failedFiles.add (mainCppFile.getFullPathName()); diff --git a/extras/Projucer/Source/Wizards/jucer_ProjectWizard_GUIApp.h b/extras/Projucer/Source/Wizards/jucer_ProjectWizard_GUIApp.h index 2f39be9a4c..710ae57627 100644 --- a/extras/Projucer/Source/Wizards/jucer_ProjectWizard_GUIApp.h +++ b/extras/Projucer/Source/Wizards/jucer_ProjectWizard_GUIApp.h @@ -75,7 +75,8 @@ struct GUIAppWizard : public NewProjectWizard setExecutableNameForAllTargets (project, File::createLegalFileName (appTitle)); - String appHeaders (CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), mainCppFile)); + auto juceHeaderInclude = CodeHelpers::createIncludePathIncludeStatement (Project::getJuceSourceHFilename()); + auto appHeaders = juceHeaderInclude; if (createWindow) { @@ -83,7 +84,7 @@ struct GUIAppWizard : public NewProjectWizard String windowH = project.getFileTemplate (createCppFile ? "jucer_ContentCompTemplate_h" : "jucer_ContentCompSimpleTemplate_h") - .replace ("%%include_juce%%", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), contentCompH), false) + .replace ("%%include_juce%%", juceHeaderInclude) .replace ("%%content_component_class%%", contentCompName, false); if (! FileHelpers::overwriteFileWithNewDataIfDifferent (contentCompH, windowH)) @@ -94,7 +95,7 @@ struct GUIAppWizard : public NewProjectWizard if (createCppFile) { String windowCpp = project.getFileTemplate ("jucer_ContentCompTemplate_cpp") - .replace ("%%include_juce%%", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), contentCompCpp), false) + .replace ("%%include_juce%%", juceHeaderInclude) .replace ("%%include_corresponding_header%%", CodeHelpers::createIncludeStatement (contentCompH, contentCompCpp), false) .replace ("%%content_component_class%%", contentCompName, false); diff --git a/extras/Projucer/Source/Wizards/jucer_ProjectWizard_openGL.h b/extras/Projucer/Source/Wizards/jucer_ProjectWizard_openGL.h index 44dee4c0fa..29b092b223 100644 --- a/extras/Projucer/Source/Wizards/jucer_ProjectWizard_openGL.h +++ b/extras/Projucer/Source/Wizards/jucer_ProjectWizard_openGL.h @@ -71,14 +71,13 @@ struct OpenGLAppWizard : public NewProjectWizard setExecutableNameForAllTargets (project, File::createLegalFileName (appTitle)); - String appHeaders (CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), mainCppFile)); + auto juceHeaderInclude = CodeHelpers::createIncludePathIncludeStatement (Project::getJuceSourceHFilename()); + auto appHeaders = juceHeaderInclude + newLine + CodeHelpers::createIncludeStatement (contentCompH, mainCppFile); // create main window - appHeaders << newLine << CodeHelpers::createIncludeStatement (contentCompH, mainCppFile); - String windowH = project.getFileTemplate (createCppFile ? "jucer_OpenGLComponentTemplate_h" : "jucer_OpenGLComponentSimpleTemplate_h") - .replace ("%%include_juce%%", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), contentCompH), false) + .replace ("%%include_juce%%", juceHeaderInclude) .replace ("%%content_component_class%%", contentCompName, false); if (! FileHelpers::overwriteFileWithNewDataIfDifferent (contentCompH, windowH)) @@ -89,7 +88,7 @@ struct OpenGLAppWizard : public NewProjectWizard if (createCppFile) { String windowCpp = project.getFileTemplate ("jucer_OpenGLComponentTemplate_cpp") - .replace ("%%include_juce%%", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), contentCompCpp), false) + .replace ("%%include_juce%%", juceHeaderInclude) .replace ("%%include_corresponding_header%%", CodeHelpers::createIncludeStatement (contentCompH, contentCompCpp), false) .replace ("%%content_component_class%%", contentCompName, false);