OLD | NEW |
---|---|
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 'variables': { | 6 'variables': { |
7 'generated_src_dir': 'src/chromium_gensrc', | 7 'generated_src_dir': 'src/chromium_gensrc', |
8 }, | 8 }, |
9 'target_defaults': { | 9 'target_defaults': { |
10 'defines': [ | 10 'defines': [ |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
121 ], | 121 ], |
122 # TODO(scottmg): http://crbug.com/143877 These should be removed if | 122 # TODO(scottmg): http://crbug.com/143877 These should be removed if |
123 # Mesa is ever rolled and the warnings are fixed. | 123 # Mesa is ever rolled and the warnings are fixed. |
124 'msvs_disabled_warnings': [ | 124 'msvs_disabled_warnings': [ |
125 4005, 4018, 4065, 4090, 4099, 4291, 4345, 4267, | 125 4005, 4018, 4065, 4090, 4099, 4291, 4345, 4267, |
126 ], | 126 ], |
127 'variables': { | 127 'variables': { |
128 'clang_warning_flags': [ | 128 'clang_warning_flags': [ |
129 '-Wno-tautological-constant-out-of-range-compare', | 129 '-Wno-tautological-constant-out-of-range-compare', |
130 '-Wno-mismatched-tags', # Fixed upstream. | 130 '-Wno-mismatched-tags', # Fixed upstream. |
131 '-Wno-incompatible-pointer-types', | |
131 ], | 132 ], |
132 'clang_warning_flags_unset': [ | 133 'clang_warning_flags_unset': [ |
133 # Don't warn about string->bool used in asserts. | 134 # Don't warn about string->bool used in asserts. |
134 '-Wstring-conversion', | 135 '-Wstring-conversion', |
135 ], | 136 ], |
136 }, | 137 }, |
137 'sources': [ | 138 'sources': [ |
138 '<(generated_src_dir)/mesa/main/dispatch.h', | 139 '<(generated_src_dir)/mesa/main/dispatch.h', |
139 'src/src/glsl/ast_expr.cpp', | 140 'src/src/glsl/ast_expr.cpp', |
140 'src/src/glsl/ast_function.cpp', | 141 'src/src/glsl/ast_function.cpp', |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
260 # TODO(scottmg): http://crbug.com/143877 These should be removed if | 261 # TODO(scottmg): http://crbug.com/143877 These should be removed if |
261 # Mesa is ever rolled and the warnings are fixed. | 262 # Mesa is ever rolled and the warnings are fixed. |
262 'msvs_disabled_warnings': [ | 263 'msvs_disabled_warnings': [ |
263 4005, 4018, 4090, 4099, 4146, 4291, 4305, 4334, 4748, 4267, | 264 4005, 4018, 4090, 4099, 4146, 4291, 4305, 4334, 4748, 4267, |
264 ], | 265 ], |
265 'variables': { | 266 'variables': { |
266 'clang_warning_flags': [ | 267 'clang_warning_flags': [ |
267 '-Wno-tautological-constant-out-of-range-compare', | 268 '-Wno-tautological-constant-out-of-range-compare', |
268 '-Wno-absolute-value', # Fires on st_atom_array.c, might be a bug | 269 '-Wno-absolute-value', # Fires on st_atom_array.c, might be a bug |
269 '-Wno-mismatched-tags', # Fixed upstream. | 270 '-Wno-mismatched-tags', # Fixed upstream. |
271 '-Wno-incompatible-pointer-types', | |
Nico
2015/07/07 18:25:11
(mesa is usually very good about fixing warnings w
Sam McNally
2015/07/08 00:52:24
Looking into this a bit further, this warning is d
| |
270 ], | 272 ], |
271 'clang_warning_flags_unset': [ | 273 'clang_warning_flags_unset': [ |
272 # Don't warn about string->bool used in asserts. | 274 # Don't warn about string->bool used in asserts. |
273 '-Wstring-conversion', | 275 '-Wstring-conversion', |
274 ], | 276 ], |
275 }, | 277 }, |
276 'sources': [ | 278 'sources': [ |
277 '<(generated_src_dir)/mesa/builtin_function.cpp', | 279 '<(generated_src_dir)/mesa/builtin_function.cpp', |
278 '<(generated_src_dir)/mesa/glapi_mapi_tmp_shared.h', | 280 '<(generated_src_dir)/mesa/glapi_mapi_tmp_shared.h', |
279 'src/src/mapi/mapi/entry.c', | 281 'src/src/mapi/mapi/entry.c', |
(...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
735 '<(PRODUCT_DIR)/libosmesa.so', | 737 '<(PRODUCT_DIR)/libosmesa.so', |
736 '<(SHARED_LIB_DIR)/libosmesa.so', | 738 '<(SHARED_LIB_DIR)/libosmesa.so', |
737 ], | 739 ], |
738 }, | 740 }, |
739 ], | 741 ], |
740 }, | 742 }, |
741 ], | 743 ], |
742 }], | 744 }], |
743 ], | 745 ], |
744 } | 746 } |
OLD | NEW |