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

Projucer: Put recommended warning flags before other flags

This commit is contained in:
Tom Poole 2019-08-08 11:15:40 +01:00
parent ece16bce70
commit 214e59aaa8
3 changed files with 7 additions and 6 deletions

View file

@ -1420,7 +1420,6 @@ private:
StringArray getProjectCompilerFlags() const
{
auto cFlags = getAndroidCompilerFlags();
cFlags.addArray (getEscapedFlags (StringArray::fromTokens (getExtraCompilerFlagsString(), true)));
return cFlags;
}

View file

@ -517,14 +517,14 @@ private:
if (config.isLinkTimeOptimisationEnabled())
result.add ("-flto");
for (auto& recommended : config.getRecommendedCompilerWarningFlags())
result.add (recommended);
auto extra = replacePreprocessorTokens (config, getExtraCompilerFlagsString()).trim();
if (extra.isNotEmpty())
result.add (extra);
for (auto& recommended : config.getRecommendedCompilerWarningFlags())
result.add (recommended);
return result;
}

View file

@ -1245,8 +1245,10 @@ public:
if (config.isFastMathEnabled())
s.set ("GCC_FAST_MATH", "YES");
auto flags = (owner.replacePreprocessorTokens (config, owner.getExtraCompilerFlagsString())
+ " " + config.getRecommendedCompilerWarningFlags().joinIntoString (" ")).trim();
auto flags = (config.getRecommendedCompilerWarningFlags().joinIntoString (" ")
+ " " + owner.getExtraCompilerFlagsString()).trim();
flags = owner.replacePreprocessorTokens (config, flags);
if (flags.isNotEmpty())
s.set ("OTHER_CPLUSPLUSFLAGS", flags.quoted());