Index: third_party/libwebp/libwebp.gyp |
diff --git a/third_party/libwebp/libwebp.gyp b/third_party/libwebp/libwebp.gyp |
index 327d9cea368d3c25ab0af862d29b20a6dcbe1d6b..1cedb13501e7834938ba3541f5d45c239ebb7600 100644 |
--- a/third_party/libwebp/libwebp.gyp |
+++ b/third_party/libwebp/libwebp.gyp |
@@ -33,6 +33,9 @@ |
'sources': [ |
'demux/demux.c', |
], |
+ 'dependencies' : [ |
+ 'libwebp_utils', |
fbarchard
2015/07/10 19:26:42
pulling in utilities as a dependency seems like ov
Sam McNally
2015/07/13 08:00:25
demux.c includes utils/utils.h so it should depend
|
+ ], |
}, |
{ |
'target_name': 'libwebp_dsp', |
@@ -59,6 +62,9 @@ |
'dsp/yuv_mips32.c', |
'dsp/yuv_sse2.c', |
], |
+ 'dependencies' : [ |
+ 'libwebp_utils', |
+ ], |
'conditions': [ |
['OS == "android"', { |
'dependencies': [ '../../build/android/ndk.gyp:cpu_features' ], |
@@ -141,6 +147,9 @@ |
'enc/vp8l.c', |
'enc/webpenc.c', |
], |
+ 'dependencies' : [ |
+ 'libwebp_utils', |
+ ], |
}, |
{ |
'target_name': 'libwebp_utils', |
@@ -160,6 +169,20 @@ |
'utils/thread.c', |
'utils/utils.c', |
], |
+ 'variables': { |
+ 'clang_warning_flags': [ |
+ # See https://code.google.com/p/webp/issues/detail?id=253. |
+ '-Wno-incompatible-pointer-types', |
+ ] |
+ }, |
+ 'direct_dependent_settings': { |
+ 'variables': { |
+ 'clang_warning_flags': [ |
+ # See https://code.google.com/p/webp/issues/detail?id=253. |
+ '-Wno-incompatible-pointer-types', |
+ ] |
+ }, |
+ }, |
}, |
{ |
'target_name': 'libwebp', |