diff options
| author | artemp <artem@mapnik.org> | 2014-11-07 11:50:33 +0000 |
|---|---|---|
| committer | artemp <artem@mapnik.org> | 2014-11-07 11:50:33 +0000 |
| commit | 52a7629b350b59ee46e7d7aead63b1a4cda3714c (patch) | |
| tree | a275999c9159c5c940cf2e4d284328079d2e3092 /gyp | |
| parent | f42d39dc6eca3154cf0de9252ac70b465022410e (diff) | |
| parent | fb7f23884bedb0a2a825baa8dc14d6b84384a0e3 (diff) | |
| download | qtlocation-mapboxgl-52a7629b350b59ee46e7d7aead63b1a4cda3714c.tar.gz | |
Merge branch 'master' into image-readers
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common.gypi | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/gyp/common.gypi b/gyp/common.gypi index df055b199f..6d5fb7690d 100644 --- a/gyp/common.gypi +++ b/gyp/common.gypi @@ -14,7 +14,16 @@ 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', 'GCC_ENABLE_CPP_EXCEPTIONS': 'YES', 'GCC_ENABLE_CPP_RTTI':'YES', - 'OTHER_CPLUSPLUSFLAGS': [ '-Werror', '-Wall', '-Wextra', '-Wshadow', '-Wno-variadic-macros', '-frtti', '-fexceptions' ], + 'OTHER_CPLUSPLUSFLAGS': [ + '-Werror', + '-Wall', + '-Wextra', + '-Wshadow', + '-Wno-variadic-macros', + '-frtti', + '-fexceptions', + '-Wno-error=unused-parameter', + ], 'GCC_WARN_PEDANTIC': 'YES', 'GCC_WARN_UNINITIALIZED_AUTOS': 'YES_AGGRESSIVE', }, @@ -23,6 +32,7 @@ 'cflags_cc': [ '-Wno-unknown-pragmas', # We are using '#pragma mark', but it is only available on Darwin. '-Wno-literal-suffix', # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61653 + '-Wno-error=unused-parameter', ], }], ], |