mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-14 00:14:18 +00:00
Code Activity

Projucer: Fixed live-build when app config is disabled

Browse source
This commit is contained in:
ed 2020-05-19 16:27:22 +01:00
parent 71fa877454
commit 7ee2af23fc
5 changed files with 62 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

27
extras/Projucer/Source/LiveBuildEngine/jucer_CompileEngineClient.cpp
View file

@ -304,24 +304,31 @@ private:
String getGlobalDefs()
{
StringArray defs;
defs.add (project.getCompileEngineSettings().getExtraPreprocessorDefsString());
auto mergeDefs = [] (const StringPairArray& inDefs) -> String
{
auto projectDefines = project.getPreprocessorDefs();
StringArray outDefs;
for (int i = 0; i < projectDefines.size(); ++i)
for (int i = 0; i < inDefs.size(); ++i)
{
auto def = projectDefines.getAllKeys()[i];
auto value = projectDefines.getAllValues()[i];
auto def = inDefs.getAllKeys()[i];
auto value = inDefs.getAllValues()[i];
if (value.isNotEmpty())
def << "=" << value;
defs.add (def);
outDefs.add (def);
}
}
return outDefs.joinIntoString (" ");
};
StringArray defs;
if (! project.shouldUseAppConfig())
defs.add (mergeDefs (project.getAppConfigDefs()));
defs.add (project.getCompileEngineSettings().getExtraPreprocessorDefsString());
defs.add (mergeDefs (project.getPreprocessorDefs()));
for (Project::ExporterIterator exporter (project); exporter.next();)
if (exporter->canLaunchProject())