diff options
| -rw-r--r-- | gyp/lua.gyp | 10 | ||||
| -rw-r--r-- | gyp/microhttpd.gyp | 9 | ||||
| -rw-r--r-- | gyp/zlib.gyp | 3 | ||||
| -rw-r--r-- | tests/MatrixTest.cpp | 2 |
4 files changed, 22 insertions, 2 deletions
diff --git a/gyp/lua.gyp b/gyp/lua.gyp index 9991e7343c..e0ad23a022 100644 --- a/gyp/lua.gyp +++ b/gyp/lua.gyp @@ -59,6 +59,16 @@ 'defines': [ "getlocaledecpoint()='.'", ], + 'cflags': [ + '-Wno-parentheses-equality', + '-Wno-pointer-bool-conversion', + ], + 'xcode_settings': { + 'WARNING_CFLAGS': [ + '-Wno-parentheses-equality', + '-Wno-pointer-bool-conversion', + ], + }, 'conditions': [ ['skia_os != "win"', { diff --git a/gyp/microhttpd.gyp b/gyp/microhttpd.gyp index 378d9a089e..3590cc1922 100644 --- a/gyp/microhttpd.gyp +++ b/gyp/microhttpd.gyp @@ -31,6 +31,15 @@ '../third_party/externals/microhttpd/src/microhttpd/response.c', '../third_party/externals/microhttpd/src/microhttpd/tsearch.c', ], + 'variables': { + 'skia_microhttpd_flags' : [ + '-Wno-sign-compare', + '-Wno-unused-const-variable', + '-Wno-tautological-constant-out-of-range-compare', + ], + }, + 'cflags': [ '<@(skia_microhttpd_flags)' ], + 'xcode_settings': { 'WARNING_CFLAGS': [ '<@(skia_microhttpd_flags)' ], }, 'conditions': [ # For each platform, run configure and scrape the generated MHD_config.h # to get a list of platform specific defines diff --git a/gyp/zlib.gyp b/gyp/zlib.gyp index 59ca61c62e..43cf6abfd2 100644 --- a/gyp/zlib.gyp +++ b/gyp/zlib.gyp @@ -19,7 +19,8 @@ }, }, { 'type': 'static_library', - 'cflags': [ '-w' ], + 'cflags': [ '-Wno-unused-value' ], + 'xcode_settings': { 'WARNING_CFLAGS': [ '-Wno-unused-value', ], }, 'sources': [ '../third_party/externals/zlib/adler32.c', '../third_party/externals/zlib/compress.c', diff --git a/tests/MatrixTest.cpp b/tests/MatrixTest.cpp index 1399bf277f..2f91ccae97 100644 --- a/tests/MatrixTest.cpp +++ b/tests/MatrixTest.cpp @@ -42,7 +42,7 @@ static bool are_equal(skiatest::Reporter* reporter, if (0 == aVal && 0 == bVal && aValI != bValI) { foundZeroSignDiff = true; } else { - REPORTER_ASSERT(reporter, aVal == bVal && aValI == aValI); + REPORTER_ASSERT(reporter, aVal == bVal && aValI == bValI); } } REPORTER_ASSERT(reporter, foundZeroSignDiff); |