Browse Source

Projucer: Put recommended warning flags before other flags

tags/2021-05-28
Tom Poole 5 years ago
parent
commit
214e59aaa8
3 changed files with 7 additions and 6 deletions
  1. +0
    -1
      extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h
  2. +3
    -3
      extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h
  3. +4
    -2
      extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h

+ 0
- 1
extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h View File

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


+ 3
- 3
extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h 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;
}


+ 4
- 2
extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h 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());


Loading…
Cancel
Save