Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(626)

Side by Side Diff: third_party/mesa/BUILD.gn

Issue 1318823008: Un-nest configs in GN files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 "/wd4099", # Type name struct-vs-class doesn't match. 141 "/wd4099", # Type name struct-vs-class doesn't match.
142 "/wd4273", # Inconsistent DLL linkage. 142 "/wd4273", # Inconsistent DLL linkage.
143 "/wd4291", # No matching operator delete found for placement new. 143 "/wd4291", # No matching operator delete found for placement new.
144 "/wd4305", # Truncation from int to float. 144 "/wd4305", # Truncation from int to float.
145 "/wd4334", # Result of 32-bit shift implicitly converted to 64 bits. 145 "/wd4334", # Result of 32-bit shift implicitly converted to 64 bits.
146 "/wd4345", # POD-type default initializers. 146 "/wd4345", # POD-type default initializers.
147 ] 147 ]
148 } 148 }
149 } 149 }
150 150
151 config("mesa_libglslcommon_warnings") {
152 if (is_clang) {
153 cflags = [
154 # https://bugs.freedesktop.org/show_bug.cgi?id=91645:
155 "-Wno-overloaded-virtual",
156 ]
157 }
158 }
159
151 static_library("mesa_libglslcommon") { 160 static_library("mesa_libglslcommon") {
152 sources = [ 161 sources = [
153 "$generated_src_dir/mesa/glcpp-lex.c", 162 "$generated_src_dir/mesa/glcpp-lex.c",
154 "$generated_src_dir/mesa/glcpp-parse.c", 163 "$generated_src_dir/mesa/glcpp-parse.c",
155 "$generated_src_dir/mesa/glcpp-parse.h", 164 "$generated_src_dir/mesa/glcpp-parse.h",
156 "$generated_src_dir/mesa/glsl_lexer.cc", 165 "$generated_src_dir/mesa/glsl_lexer.cc",
157 "$generated_src_dir/mesa/glsl_parser.cc", 166 "$generated_src_dir/mesa/glsl_parser.cc",
158 "$generated_src_dir/mesa/main/dispatch.h", 167 "$generated_src_dir/mesa/main/dispatch.h",
159 "src/src/glsl/ast_expr.cpp", 168 "src/src/glsl/ast_expr.cpp",
160 "src/src/glsl/ast_function.cpp", 169 "src/src/glsl/ast_function.cpp",
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 "src/src/glsl/s_expression.h", 254 "src/src/glsl/s_expression.h",
246 255
247 # Skipped in the GN build. This file duplicates symbols from errors.c and 256 # Skipped in the GN build. This file duplicates symbols from errors.c and
248 # happens to link in GYP due to static library link ordering. 257 # happens to link in GYP due to static library link ordering.
249 #"src/src/glsl/standalone_scaffolding.cpp", 258 #"src/src/glsl/standalone_scaffolding.cpp",
250 #"src/src/glsl/standalone_scaffolding.h", 259 #"src/src/glsl/standalone_scaffolding.h",
251 "src/src/glsl/strtod.c", 260 "src/src/glsl/strtod.c",
252 "src/src/glsl/strtod.h", 261 "src/src/glsl/strtod.h",
253 ] 262 ]
254 263
255 config("mesa_libglslcommon_warnings") {
256 if (is_clang) {
257 cflags = [
258 # https://bugs.freedesktop.org/show_bug.cgi?id=91645:
259 "-Wno-overloaded-virtual",
260 ]
261 }
262 }
263
264 configs -= [ "//build/config/compiler:chromium_code" ] 264 configs -= [ "//build/config/compiler:chromium_code" ]
265 configs += [ "//build/config/compiler:no_chromium_code" ] 265 configs += [ "//build/config/compiler:no_chromium_code" ]
266 previous_configs = configs 266 previous_configs = configs
267 configs = [] 267 configs = []
268 configs = [ ":mesa_internal_config" ] + previous_configs + [ 268 configs = [ ":mesa_internal_config" ] + previous_configs + [
269 ":mesa_internal_warnings", 269 ":mesa_internal_warnings",
270 ":mesa_libglslcommon_warnings", 270 ":mesa_libglslcommon_warnings",
271 ] 271 ]
272 272
273 if (is_clang) { 273 if (is_clang) {
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after
732 "KEYWORD2=GLAPIENTRY", 732 "KEYWORD2=GLAPIENTRY",
733 ] 733 ]
734 } 734 }
735 } 735 }
736 } else { 736 } else {
737 # Placeholder to allow targets to unconditionally depend on this. 737 # Placeholder to allow targets to unconditionally depend on this.
738 group("osmesa") { 738 group("osmesa") {
739 } 739 }
740 } # !is_android 740 } # !is_android
741 # TODO(GYP) Android osmesa_in_lib_dir target. 741 # TODO(GYP) Android osmesa_in_lib_dir target.
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698