diff options
| -rw-r--r-- | bench/MemoryBench.cpp | 2 | ||||
| -rw-r--r-- | gyp/common_conditions.gypi | 11 | ||||
| -rw-r--r-- | gyp/libwebp.gyp | 4 |
3 files changed, 14 insertions, 3 deletions
diff --git a/bench/MemoryBench.cpp b/bench/MemoryBench.cpp index 3fc46dccf4..f8af1683b0 100644 --- a/bench/MemoryBench.cpp +++ b/bench/MemoryBench.cpp @@ -87,7 +87,7 @@ public: } else if (write) { fName.appendf("_w"); } - fName.appendf("_"SK_SIZE_T_SPECIFIER, num); + fName.appendf("_" SK_SIZE_T_SPECIFIER, num); } virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 17eeb78ec5..cfc6d32edc 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -474,9 +474,16 @@ ], }], [ 'skia_clang_build', { + 'cflags_cc': [ + # Build in C++11 mode to make sure we'll have an easy time switching. + '-std=c++11', + '-Wno-unknown-warning-option', # Allows unknown warnings. + '-Wno-deprecated', # From Qt, via debugger (older Clang). + '-Wno-deprecated-register', # From Qt, via debugger (newer Clang). + ], 'cflags': [ - # Extra warnings we like but that only Clang knows about. - '-Wstring-conversion', + # Extra warnings we like but that only Clang knows about. + '-Wstring-conversion', ], 'cflags!': [ '-mfpmath=sse', # Clang doesn't need to be told this, and sometimes gets confused. diff --git a/gyp/libwebp.gyp b/gyp/libwebp.gyp index 22a51ba13f..64ad971798 100644 --- a/gyp/libwebp.gyp +++ b/gyp/libwebp.gyp @@ -4,6 +4,7 @@ { 'variables': { + 'skia_warnings_as_errors': 0, 'conditions':[ ['skia_android_framework == 1', { 'use_system_libwebp': 1, @@ -159,6 +160,9 @@ 'include_dirs': [ '../third_party/externals/libwebp/src', ], + 'cflags': [ + '-Wno-unused-function', # In C++11 mode, we get this warning when including decode.h. + ] }, 'conditions': [ ['OS!="win"', {'product_name': 'webp'}], |