diff --git a/extras/Projucer/Source/Project Saving/jucer_ProjectSaver.h b/extras/Projucer/Source/Project Saving/jucer_ProjectSaver.h index 9af082e737..7565f4839e 100644 --- a/extras/Projucer/Source/Project Saving/jucer_ProjectSaver.h +++ b/extras/Projucer/Source/Project Saving/jucer_ProjectSaver.h @@ -554,7 +554,11 @@ private: if (resourceFile.getNumFiles() > 0) { - resourceFile.setClassName ("BinaryData"); + auto dataNamespace = project.binaryDataNamespace().toString().trim(); + if (dataNamespace.isEmpty()) + dataNamespace = "BinaryData"; + + resourceFile.setClassName (dataNamespace); Array binaryDataFiles; diff --git a/extras/Projucer/Source/Project/jucer_Project.cpp b/extras/Projucer/Source/Project/jucer_Project.cpp index 213b31f1d1..b3b09ba4a3 100644 --- a/extras/Projucer/Source/Project/jucer_Project.cpp +++ b/extras/Projucer/Source/Project/jucer_Project.cpp @@ -502,6 +502,9 @@ void Project::createPropertyEditors (PropertyListBuilder& props) props.add (new BooleanPropertyComponent (shouldIncludeBinaryInAppConfig(), "Include Binary", "Include BinaryData.h in the AppConfig.h file")); + props.add (new TextPropertyComponent (binaryDataNamespace(), "BinaryData Namespace", 256, false), + "The namespace containing the binary assests. If left empty this defaults to \"BinaryData\"."); + props.add (new TextPropertyComponent (getProjectPreprocessorDefs(), "Preprocessor definitions", 32768, true), "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."); diff --git a/extras/Projucer/Source/Project/jucer_Project.h b/extras/Projucer/Source/Project/jucer_Project.h index 520c5cf6ae..f78b008aca 100644 --- a/extras/Projucer/Source/Project/jucer_Project.h +++ b/extras/Projucer/Source/Project/jucer_Project.h @@ -113,6 +113,7 @@ public: File getBinaryDataHeaderFile() const { return getBinaryDataCppFile (0).withFileExtension (".h"); } Value getMaxBinaryFileSize() { return getProjectValue (Ids::maxBinaryFileSize); } Value shouldIncludeBinaryInAppConfig() { return getProjectValue (Ids::includeBinaryInAppConfig); } + Value binaryDataNamespace() { return getProjectValue (Ids::binaryDataNamespace); } //============================================================================== String getAppConfigFilename() const { return "AppConfig.h"; } diff --git a/extras/Projucer/Source/Utility/jucer_PresetIDs.h b/extras/Projucer/Source/Utility/jucer_PresetIDs.h index b65beff8ad..e2885c2103 100644 --- a/extras/Projucer/Source/Utility/jucer_PresetIDs.h +++ b/extras/Projucer/Source/Utility/jucer_PresetIDs.h @@ -182,6 +182,7 @@ namespace Ids DECLARE_ID (userNotes); DECLARE_ID (maxBinaryFileSize); DECLARE_ID (includeBinaryInAppConfig); + DECLARE_ID (binaryDataNamespace); DECLARE_ID (characterSet); DECLARE_ID (JUCERPROJECT); DECLARE_ID (MAINGROUP);