| 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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 'mesa_headers', | 125 'mesa_headers', |
| 126 ], | 126 ], |
| 127 # TODO(scottmg): http://crbug.com/143877 These should be removed if | 127 # TODO(scottmg): http://crbug.com/143877 These should be removed if |
| 128 # Mesa is ever rolled and the warnings are fixed. | 128 # Mesa is ever rolled and the warnings are fixed. |
| 129 'msvs_disabled_warnings': [ | 129 'msvs_disabled_warnings': [ |
| 130 4005, 4018, 4065, 4090, 4099, 4291, 4345, 4267, | 130 4005, 4018, 4065, 4090, 4099, 4291, 4345, 4267, |
| 131 ], | 131 ], |
| 132 'variables': { | 132 'variables': { |
| 133 'clang_warning_flags': [ | 133 'clang_warning_flags': [ |
| 134 '-Wno-tautological-constant-out-of-range-compare', | 134 '-Wno-tautological-constant-out-of-range-compare', |
| 135 '-Wno-mismatched-tags', # Fixed upstream. | |
| 136 ], | 135 ], |
| 137 'clang_warning_flags_unset': [ | 136 'clang_warning_flags_unset': [ |
| 138 # Don't warn about string->bool used in asserts. | 137 # Don't warn about string->bool used in asserts. |
| 139 '-Wstring-conversion', | 138 '-Wstring-conversion', |
| 140 ], | 139 ], |
| 141 }, | 140 }, |
| 142 'sources': [ | 141 'sources': [ |
| 143 '<(generated_src_dir)/mesa/main/dispatch.h', | 142 '<(generated_src_dir)/mesa/main/dispatch.h', |
| 144 'src/src/glsl/ast_expr.cpp', | 143 'src/src/glsl/ast_expr.cpp', |
| 145 'src/src/glsl/ast_function.cpp', | 144 'src/src/glsl/ast_function.cpp', |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 263 'mesa_libglslcommon', | 262 'mesa_libglslcommon', |
| 264 ], | 263 ], |
| 265 # TODO(scottmg): http://crbug.com/143877 These should be removed if | 264 # TODO(scottmg): http://crbug.com/143877 These should be removed if |
| 266 # Mesa is ever rolled and the warnings are fixed. | 265 # Mesa is ever rolled and the warnings are fixed. |
| 267 'msvs_disabled_warnings': [ | 266 'msvs_disabled_warnings': [ |
| 268 4005, 4018, 4090, 4099, 4146, 4291, 4305, 4334, 4748, 4267, | 267 4005, 4018, 4090, 4099, 4146, 4291, 4305, 4334, 4748, 4267, |
| 269 ], | 268 ], |
| 270 'variables': { | 269 'variables': { |
| 271 'clang_warning_flags': [ | 270 'clang_warning_flags': [ |
| 272 '-Wno-tautological-constant-out-of-range-compare', | 271 '-Wno-tautological-constant-out-of-range-compare', |
| 273 '-Wno-absolute-value', # Fires on st_atom_array.c, might be a bug | |
| 274 '-Wno-mismatched-tags', # Fixed upstream. | |
| 275 ], | 272 ], |
| 276 'clang_warning_flags_unset': [ | 273 'clang_warning_flags_unset': [ |
| 277 # Don't warn about string->bool used in asserts. | 274 # Don't warn about string->bool used in asserts. |
| 278 '-Wstring-conversion', | 275 '-Wstring-conversion', |
| 279 ], | 276 ], |
| 280 }, | 277 }, |
| 281 'sources': [ | 278 'sources': [ |
| 282 '<(generated_src_dir)/mesa/builtin_function.cpp', | 279 '<(generated_src_dir)/mesa/builtin_function.cpp', |
| 283 '<(generated_src_dir)/mesa/glapi_mapi_tmp_shared.h', | 280 '<(generated_src_dir)/mesa/glapi_mapi_tmp_shared.h', |
| 284 'src/src/mapi/mapi/entry.c', | 281 'src/src/mapi/mapi/entry.c', |
| (...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 731 '<(PRODUCT_DIR)/libosmesa.so', | 728 '<(PRODUCT_DIR)/libosmesa.so', |
| 732 '<(SHARED_LIB_DIR)/libosmesa.so', | 729 '<(SHARED_LIB_DIR)/libosmesa.so', |
| 733 ], | 730 ], |
| 734 }, | 731 }, |
| 735 ], | 732 ], |
| 736 }, | 733 }, |
| 737 ], | 734 ], |
| 738 }], | 735 }], |
| 739 ], | 736 ], |
| 740 } | 737 } |
| OLD | NEW |