OLD | NEW |
1 # Copyright 2011 Google Inc. | 1 # Copyright 2011 Google Inc. |
2 # | 2 # |
3 # Licensed under the Apache License, Version 2.0 (the "License"); | 3 # Licensed under the Apache License, Version 2.0 (the "License"); |
4 # you may not use this file except in compliance with the License. | 4 # you may not use this file except in compliance with the License. |
5 # You may obtain a copy of the License at | 5 # You may obtain a copy of the License at |
6 # | 6 # |
7 # http://www.apache.org/licenses/LICENSE-2.0 | 7 # http://www.apache.org/licenses/LICENSE-2.0 |
8 # | 8 # |
9 # Unless required by applicable law or agreed to in writing, software | 9 # Unless required by applicable law or agreed to in writing, software |
10 # distributed under the License is distributed on an "AS IS" BASIS, | 10 # distributed under the License is distributed on an "AS IS" BASIS, |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 'conditions': [ | 59 'conditions': [ |
60 ['OS=="win"', { | 60 ['OS=="win"', { |
61 'sources': [ | 61 'sources': [ |
62 'src/windows/port.cc', | 62 'src/windows/port.cc', |
63 ], | 63 ], |
64 # Suppress warnings about WIN32_LEAN_AND_MEAN and size_t truncation. | 64 # Suppress warnings about WIN32_LEAN_AND_MEAN and size_t truncation. |
65 'msvs_disabled_warnings': [4005, 4267], | 65 'msvs_disabled_warnings': [4005, 4267], |
66 }], | 66 }], |
67 # TODO(andrew): Look into fixing this warning upstream: | 67 # TODO(andrew): Look into fixing this warning upstream: |
68 # http://code.google.com/p/webrtc/issues/detail?id=760 | 68 # http://code.google.com/p/webrtc/issues/detail?id=760 |
| 69 ['OS=="win" and clang==1', { |
| 70 'msvs_settings': { |
| 71 'VCCLCompilerTool': { |
| 72 'AdditionalOptions!': [ |
| 73 '-Wheader-hygiene', # Suppress warning about using namespace. |
| 74 ], |
| 75 'AdditionalOptions': [ |
| 76 '-Wno-unused-local-typedef', # Suppress unused private typedef. |
| 77 ], |
| 78 }, |
| 79 }, |
| 80 }], |
69 ['clang==1', { | 81 ['clang==1', { |
70 'cflags!': ['-Wheader-hygiene',], | 82 'cflags!': ['-Wheader-hygiene',], |
71 'xcode_settings': { | 83 'xcode_settings': { |
72 'WARNING_CFLAGS!': ['-Wheader-hygiene',], | 84 'WARNING_CFLAGS!': ['-Wheader-hygiene',], |
73 }, | 85 }, |
74 }], | 86 }], |
75 ], | 87 ], |
76 }, | 88 }, |
77 ], | 89 ], |
78 } | 90 } |
OLD | NEW |