| @@ -1420,7 +1420,6 @@ private: | |||||
| StringArray getProjectCompilerFlags() const | StringArray getProjectCompilerFlags() const | ||||
| { | { | ||||
| auto cFlags = getAndroidCompilerFlags(); | auto cFlags = getAndroidCompilerFlags(); | ||||
| cFlags.addArray (getEscapedFlags (StringArray::fromTokens (getExtraCompilerFlagsString(), true))); | cFlags.addArray (getEscapedFlags (StringArray::fromTokens (getExtraCompilerFlagsString(), true))); | ||||
| return cFlags; | return cFlags; | ||||
| } | } | ||||
| @@ -517,14 +517,14 @@ private: | |||||
| if (config.isLinkTimeOptimisationEnabled()) | if (config.isLinkTimeOptimisationEnabled()) | ||||
| result.add ("-flto"); | result.add ("-flto"); | ||||
| for (auto& recommended : config.getRecommendedCompilerWarningFlags()) | |||||
| result.add (recommended); | |||||
| auto extra = replacePreprocessorTokens (config, getExtraCompilerFlagsString()).trim(); | auto extra = replacePreprocessorTokens (config, getExtraCompilerFlagsString()).trim(); | ||||
| if (extra.isNotEmpty()) | if (extra.isNotEmpty()) | ||||
| result.add (extra); | result.add (extra); | ||||
| for (auto& recommended : config.getRecommendedCompilerWarningFlags()) | |||||
| result.add (recommended); | |||||
| return result; | return result; | ||||
| } | } | ||||
| @@ -1245,8 +1245,10 @@ public: | |||||
| if (config.isFastMathEnabled()) | if (config.isFastMathEnabled()) | ||||
| s.set ("GCC_FAST_MATH", "YES"); | 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()) | if (flags.isNotEmpty()) | ||||
| s.set ("OTHER_CPLUSPLUSFLAGS", flags.quoted()); | s.set ("OTHER_CPLUSPLUSFLAGS", flags.quoted()); | ||||