AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #5069 from syershov/fix-gcc-build

Browse source 
Fix gcc compile options
This commit is contained in:
Ilya Zverev 2016-12-20 17:34:15 +04:00 • committed by GitHub
commit 0de231ee3e
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common.pri
View file

@ -127,8 +127,7 @@ win32-msvc201* {
# unix also works for Android
unix|win32-g++ {
LIBS *= -lz
QMAKE_CXXFLAGS_WARN_ON += -Wno-strict-aliasing -Wsign-compare -Wshorten-64-to-32
QMAKE_CXXFLAGS_WARN_ON += -Wno-strict-aliasing -Wsign-compare
# -Wno-unused-local-typedef is not supported on clang 3.5.
IS_CLANG35 = $$system( echo | $$QMAKE_CXX -dM -E - | grep '__clang_version__.*3\.5.*' )
if (isEmpty(IS_CLANG35)){
@ -136,7 +135,7 @@ unix|win32-g++ {
}
# TODO: Check if we really need these warnings on every platform (by syershov).
*-clang* {
QMAKE_CXXFLAGS_WARN_ON += -Werror=return-type
QMAKE_CXXFLAGS_WARN_ON += -Werror=return-type -Wshorten-64-to-32
}
tizen{