1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00

Projucer: Made preprocessor define precedence consistent when not using a global AppConfig file

When a global AppConfig file is not added to a project, preprocessor defines from project, exporter and target settings now override defines that would have been in this file, matching the previous behaviour.
This commit is contained in:
ed 2020-11-16 09:01:41 +00:00
parent 36f1197536
commit 42391ce309

View file

@ -414,7 +414,7 @@ StringPairArray ProjectExporter::getAllPreprocessorDefs (const BuildConfiguratio
addTargetSpecificPreprocessorDefs (defs, targetType);
if (! project.shouldUseAppConfig())
defs = mergePreprocessorDefs (defs, project.getAppConfigDefs());
defs = mergePreprocessorDefs (project.getAppConfigDefs(), defs);
return defs;
}