diff --git a/extras/Projucer/Source/Project/jucer_Project.cpp b/extras/Projucer/Source/Project/jucer_Project.cpp index 9bab53734b..ba41f0cce8 100644 --- a/extras/Projucer/Source/Project/jucer_Project.cpp +++ b/extras/Projucer/Source/Project/jucer_Project.cpp @@ -218,9 +218,15 @@ void Project::initialiseProjectValues() preprocessorDefsValue.referTo (projectRoot, Ids::defines, getUndoManager()); userNotesValue.referTo (projectRoot, Ids::userNotes, getUndoManager()); - maxBinaryFileSizeValue.referTo (projectRoot, Ids::maxBinaryFileSize, getUndoManager(), 10240 * 1024); - includeBinaryDataInAppConfigValue.referTo (projectRoot, Ids::includeBinaryInAppConfig, getUndoManager(), true); - binaryDataNamespaceValue.referTo (projectRoot, Ids::binaryDataNamespace, getUndoManager(), "BinaryData"); + maxBinaryFileSizeValue.referTo (projectRoot, Ids::maxBinaryFileSize, getUndoManager(), 10240 * 1024); + + // this is here for backwards compatibility with old projects using the incorrect id + if (projectRoot.hasProperty ("includeBinaryInAppConfig")) + includeBinaryDataInJuceHeaderValue.referTo (projectRoot, "includeBinaryInAppConfig", getUndoManager(), true); + else + includeBinaryDataInJuceHeaderValue.referTo (projectRoot, Ids::includeBinaryInJuceHeader, getUndoManager(), true); + + binaryDataNamespaceValue.referTo (projectRoot, Ids::binaryDataNamespace, getUndoManager(), "BinaryData"); } void Project::initialiseAudioPluginValues() @@ -970,8 +976,8 @@ void Project::createPropertyEditors (PropertyListBuilder& props) "(Note that individual resource files which are larger than this size cannot be split across multiple cpp files)."); } - props.add (new ChoicePropertyComponent (includeBinaryDataInAppConfigValue, "Include BinaryData in AppConfig"), - "Include BinaryData.h in the AppConfig.h file"); + props.add (new ChoicePropertyComponent (includeBinaryDataInJuceHeaderValue, "Include BinaryData in JuceHeader"), + "Include BinaryData.h in the JuceHeader.h file"); props.add (new TextPropertyComponent (binaryDataNamespaceValue, "BinaryData Namespace", 256, false), "The namespace containing the binary assests."); diff --git a/extras/Projucer/Source/Project/jucer_Project.h b/extras/Projucer/Source/Project/jucer_Project.h index c5f3347531..be5230462e 100644 --- a/extras/Projucer/Source/Project/jucer_Project.h +++ b/extras/Projucer/Source/Project/jucer_Project.h @@ -116,7 +116,7 @@ public: StringPairArray getPreprocessorDefs() const { return parsedPreprocessorDefs; } int getMaxBinaryFileSize() const { return maxBinaryFileSizeValue.get(); } - bool shouldIncludeBinaryInAppConfig() const { return includeBinaryDataInAppConfigValue.get(); } + bool shouldIncludeBinaryInJuceHeader() const { return includeBinaryDataInJuceHeaderValue.get(); } String getBinaryDataNamespaceString() const { return binaryDataNamespaceValue.get(); } bool shouldDisplaySplashScreen() const { return displaySplashScreenValue.get(); } @@ -391,7 +391,7 @@ private: ValueWithDefault projectNameValue, projectUIDValue, projectTypeValue, versionValue, bundleIdentifierValue, companyNameValue, companyCopyrightValue, companyWebsiteValue, companyEmailValue, displaySplashScreenValue, reportAppUsageValue, splashScreenColourValue, cppStandardValue, - headerSearchPathsValue, preprocessorDefsValue, userNotesValue, maxBinaryFileSizeValue, includeBinaryDataInAppConfigValue, binaryDataNamespaceValue; + headerSearchPathsValue, preprocessorDefsValue, userNotesValue, maxBinaryFileSizeValue, includeBinaryDataInJuceHeaderValue, binaryDataNamespaceValue; ValueWithDefault pluginFormatsValue, pluginNameValue, pluginDescriptionValue, pluginManufacturerValue, pluginManufacturerCodeValue, pluginCodeValue, pluginChannelConfigsValue, pluginCharacteristicsValue, pluginAUExportPrefixValue, pluginAAXIdentifierValue, diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectSaver.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectSaver.h index dbc53241de..3f5b73174b 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectSaver.h +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectSaver.h @@ -543,7 +543,7 @@ private: out << newLine; } - if (hasBinaryData && project.shouldIncludeBinaryInAppConfig()) + if (hasBinaryData && project.shouldIncludeBinaryInJuceHeader()) out << CodeHelpers::createIncludeStatement (project.getBinaryDataHeaderFile(), appConfigFile) << newLine; out << newLine diff --git a/extras/Projucer/Source/Utility/Helpers/jucer_PresetIDs.h b/extras/Projucer/Source/Utility/Helpers/jucer_PresetIDs.h index 172a0182ef..6ae0c3ad89 100644 --- a/extras/Projucer/Source/Utility/Helpers/jucer_PresetIDs.h +++ b/extras/Projucer/Source/Utility/Helpers/jucer_PresetIDs.h @@ -242,7 +242,7 @@ namespace Ids DECLARE_ID (colour); DECLARE_ID (userNotes); DECLARE_ID (maxBinaryFileSize); - DECLARE_ID (includeBinaryInAppConfig); + DECLARE_ID (includeBinaryInJuceHeader); DECLARE_ID (binaryDataNamespace); DECLARE_ID (characterSet); DECLARE_ID (JUCERPROJECT);