diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h index dfdaec9662..8d556b2d07 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h @@ -1455,7 +1455,6 @@ public: if (config.isFastMathEnabled()) s.set ("GCC_FAST_MATH", "YES"); - auto flags = (config.getRecommendedCompilerWarningFlags().joinIntoString (" ") + " " + owner.getExtraCompilerFlagsString()).trim(); flags = owner.replacePreprocessorTokens (config, flags); diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp index 544073a06d..887ffe99fd 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp @@ -410,6 +410,7 @@ StringPairArray ProjectExporter::getAllPreprocessorDefs (const BuildConfiguratio { auto defs = mergePreprocessorDefs (config.getAllPreprocessorDefs(), parsePreprocessorDefs (getExporterPreprocessorDefsString())); + addDefaultPreprocessorDefs (defs); addTargetSpecificPreprocessorDefs (defs, targetType); @@ -465,8 +466,8 @@ void ProjectExporter::addDefaultPreprocessorDefs (StringPairArray& defs) const String ProjectExporter::replacePreprocessorTokens (const ProjectExporter::BuildConfiguration& config, const String& sourceString) const { - return build_tools::replacePreprocessorDefs (getAllPreprocessorDefs (config, - build_tools::ProjectType::Target::unspecified), sourceString); + return build_tools::replacePreprocessorDefs (getAllPreprocessorDefs (config, build_tools::ProjectType::Target::unspecified), + sourceString); } void ProjectExporter::copyMainGroupFromProject()