gyp: clean up warnings with clang-3.8
Also: update zlib DEPS. GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2002233002 Review-Url: https://codereview.chromium.org/2002233002
This commit is contained in:
parent
c75d6a8e43
commit
3d5942e8a4
2
DEPS
2
DEPS
@ -16,7 +16,7 @@ deps = {
|
||||
"third_party/externals/jsoncpp" : "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git@1.0.0",
|
||||
"third_party/externals/libwebp" : "https://chromium.googlesource.com/webm/libwebp.git@v0.5.0",
|
||||
"third_party/externals/nanomsg" : "https://skia.googlesource.com/third_party/nanomsg.git@0.4-beta",
|
||||
"third_party/externals/zlib" : "https://chromium.googlesource.com/chromium/src/third_party/zlib@c4e33043fb071b6ea0a153845da625d7ed633d3d",
|
||||
"third_party/externals/zlib" : "https://chromium.googlesource.com/chromium/src/third_party/zlib@4576304a4b9835aa8646c9735b079e1d96858633",
|
||||
# NOTE: If we update libpng, we may need to update the generated file at third_party/libpng/pnglibconf.h
|
||||
# skbug.com/4710: We'd prefer to mirror AOSP or Chrome.
|
||||
"third_party/externals/libpng" : "https://github.com/mattsarett/libpng.git@91d2a9e56ea83f7bce091b1606ae4d04ddfc547a",
|
||||
|
@ -24,7 +24,8 @@
|
||||
],
|
||||
'cflags':[
|
||||
# FIXME: This gets around a warning: "Argument might be clobbered by longjmp".
|
||||
'-Wno-clobbered -Wno-error',
|
||||
'-Wno-clobbered',
|
||||
'-Wno-unknown-warning-option',
|
||||
],
|
||||
'include_dirs': [
|
||||
'../include/codec',
|
||||
|
11
gyp/lua.gyp
11
gyp/lua.gyp
@ -59,16 +59,15 @@
|
||||
'defines': [
|
||||
"getlocaledecpoint()='.'",
|
||||
],
|
||||
'cflags': [
|
||||
'-Wno-parentheses-equality',
|
||||
'-Wno-pointer-bool-conversion',
|
||||
],
|
||||
'xcode_settings': {
|
||||
'WARNING_CFLAGS': [
|
||||
'variables': {
|
||||
'skia_lua_flags' : [
|
||||
'-Wno-parentheses-equality',
|
||||
'-Wno-pointer-bool-conversion',
|
||||
'-Wno-array-bounds',
|
||||
],
|
||||
},
|
||||
'cflags': [ '<@(skia_lua_flags)' ],
|
||||
'xcode_settings': { 'WARNING_CFLAGS': [ '<@(skia_lua_flags)' ], },
|
||||
'conditions': [
|
||||
['skia_os != "win"',
|
||||
{
|
||||
|
10
gyp/zlib.gyp
10
gyp/zlib.gyp
@ -19,8 +19,14 @@
|
||||
},
|
||||
}, {
|
||||
'type': 'static_library',
|
||||
'cflags': [ '-Wno-unused-value' ],
|
||||
'xcode_settings': { 'WARNING_CFLAGS': [ '-Wno-unused-value', ], },
|
||||
'variables': {
|
||||
'skia_zlib_flags' : [
|
||||
'-Wno-unused-value',
|
||||
'-Wno-shift-negative-value',
|
||||
],
|
||||
},
|
||||
'cflags': [ '<@(skia_zlib_flags)' ],
|
||||
'xcode_settings': { 'WARNING_CFLAGS': [ '<@(skia_zlib_flags)' ], },
|
||||
'sources': [
|
||||
'../third_party/externals/zlib/adler32.c',
|
||||
'../third_party/externals/zlib/compress.c',
|
||||
|
Loading…
Reference in New Issue
Block a user