From 42391ce3091ca29be7b20d994d97c402bb6905ed Mon Sep 17 00:00:00 2001 From: ed Date: Mon, 16 Nov 2020 09:01:41 +0000 Subject: [PATCH] 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. --- extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp index 0d7822319f..544073a06d 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp @@ -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; }