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:
parent
36f1197536
commit
42391ce309
1 changed files with 1 additions and 1 deletions
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue