OLD | NEW |
1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 { | 5 { |
6 'includes': [ | 6 'includes': [ |
7 'openh264.gypi', | 7 'openh264.gypi', |
8 'openh264_args.gypi', | 8 'openh264_args.gypi', |
9 ], | 9 ], |
10 # Settings shared by all openh264 targets. | 10 # Settings shared by all openh264 targets. |
(...skipping 26 matching lines...) Expand all Loading... |
37 4324, # structure was padded | 37 4324, # structure was padded |
38 4245, # signed/unsigned mismatch | 38 4245, # signed/unsigned mismatch |
39 4701, # uninitialized variable used | 39 4701, # uninitialized variable used |
40 4702, # unreachable code | 40 4702, # unreachable code |
41 ], | 41 ], |
42 }, { | 42 }, { |
43 # For clang on windows, |cflags| is mysteriously ignored and we | 43 # For clang on windows, |cflags| is mysteriously ignored and we |
44 # resort to using |AdditionalOptions| instead. | 44 # resort to using |AdditionalOptions| instead. |
45 'msvs_settings': { | 45 'msvs_settings': { |
46 'VCCLCompilerTool': { | 46 'VCCLCompilerTool': { |
| 47 'AdditionalOptions': [ |
| 48 '-Wno-unused-function', |
| 49 '-Wno-unused-value', |
| 50 ], |
47 'AdditionalOptions!': [ | 51 'AdditionalOptions!': [ |
48 '-Wheader-hygiene', | 52 '-Wheader-hygiene', |
49 ], | 53 ], |
50 'AdditionalOptions': [ | |
51 '-Wno-unused-value', | |
52 ], | |
53 }, | 54 }, |
54 }, | 55 }, |
55 }], | 56 }], |
56 ], | 57 ], |
57 }], | 58 }], |
58 ['OS=="android"', { | 59 ['OS=="android"', { |
59 'defines': [ | 60 'defines': [ |
60 # Android NDK is necessary for its cpufeatures and this define is | 61 # Android NDK is necessary for its cpufeatures and this define is |
61 # what OpenH264 code uses to check if it should be used. | 62 # what OpenH264 code uses to check if it should be used. |
62 'ANDROID_NDK', | 63 'ANDROID_NDK', |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
96 'type': 'static_library', | 97 'type': 'static_library', |
97 'dependencies': [ | 98 'dependencies': [ |
98 'openh264_common', | 99 'openh264_common', |
99 'openh264_processing', | 100 'openh264_processing', |
100 ], | 101 ], |
101 'include_dirs+': [ '<@(openh264_encoder_includes)' ], | 102 'include_dirs+': [ '<@(openh264_encoder_includes)' ], |
102 'sources': [ '<@(openh264_encoder_sources)' ], | 103 'sources': [ '<@(openh264_encoder_sources)' ], |
103 }, | 104 }, |
104 ], | 105 ], |
105 } | 106 } |
OLD | NEW |