| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 import("//build/config/ui.gni") | 5 import("//build/config/ui.gni") |
| 6 | 6 |
| 7 config("mesa_headers_config") { | 7 config("mesa_headers_config") { |
| 8 include_dirs = [ "src/include" ] | 8 include_dirs = [ "src/include" ] |
| 9 if (use_x11) { | 9 if (use_x11) { |
| 10 defines = [ "MESA_EGL_NO_X11_HEADERS" ] | 10 defines = [ "MESA_EGL_NO_X11_HEADERS" ] |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 } | 106 } |
| 107 | 107 |
| 108 if (!is_android && !is_mac) { | 108 if (!is_android && !is_mac) { |
| 109 cflags += [ "-fPIC" ] | 109 cflags += [ "-fPIC" ] |
| 110 } | 110 } |
| 111 } | 111 } |
| 112 | 112 |
| 113 if (is_win) { | 113 if (is_win) { |
| 114 # TODO(scottmg): http://crbug.com/143877 These should be removed if | 114 # TODO(scottmg): http://crbug.com/143877 These should be removed if |
| 115 # Mesa is ever rolled and the warnings are fixed. | 115 # Mesa is ever rolled and the warnings are fixed. |
| 116 cflags = [ | 116 cflags += [ |
| 117 "/wd4005", # Macro defined twice. | 117 "/wd4005", # Macro defined twice. |
| 118 "/wd4065", # Switch statement contains 'default' but no 'case' labels. | 118 "/wd4065", # Switch statement contains 'default' but no 'case' labels. |
| 119 "/wd4090", # 'Operation' : different 'modifier' qualifiers | 119 "/wd4090", # 'Operation' : different 'modifier' qualifiers |
| 120 "/wd4099", # Type name struct-vs-class doesn't match. | 120 "/wd4099", # Type name struct-vs-class doesn't match. |
| 121 "/wd4267", # size_t to type. | 121 "/wd4267", # size_t to type. |
| 122 "/wd4273", # Inconsistent DLL linkage. | 122 "/wd4273", # Inconsistent DLL linkage. |
| 123 "/wd4291", # No matching operator delete found for placement new. | 123 "/wd4291", # No matching operator delete found for placement new. |
| 124 "/wd4305", # Truncation from int to float. | 124 "/wd4305", # Truncation from int to float. |
| 125 "/wd4334", # Result of 32-bit shift implicitly converted to 64 bits. | 125 "/wd4334", # Result of 32-bit shift implicitly converted to 64 bits. |
| 126 "/wd4345", # POD-type default initializers. | 126 "/wd4345", # POD-type default initializers. |
| (...skipping 563 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 690 "BUILD_GL32", | 690 "BUILD_GL32", |
| 691 "KEYWORD1=GLAPI", | 691 "KEYWORD1=GLAPI", |
| 692 "KEYWORD2=GLAPIENTRY", | 692 "KEYWORD2=GLAPIENTRY", |
| 693 ] | 693 ] |
| 694 } | 694 } |
| 695 } | 695 } |
| 696 | 696 |
| 697 } # !is_android | 697 } # !is_android |
| 698 | 698 |
| 699 # TODO(GYP) Android osmesa_in_lib_dir target. | 699 # TODO(GYP) Android osmesa_in_lib_dir target. |
| OLD | NEW |