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

Side by Side Diff: gpu/config/BUILD.gn

Issue 929793006: Update existing uses of /wd4267 to use the GN config (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@x64
Patch Set: Created 5 years, 10 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
« no previous file with comments | « gpu/command_buffer/client/BUILD.gn ('k') | media/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 declare_args() { 7 declare_args() {
8 # Use the PCI lib to collect GPU information on Linux. 8 # Use the PCI lib to collect GPU information on Linux.
9 use_libpci = true 9 use_libpci = true
10 } 10 }
(...skipping 27 matching lines...) Expand all
38 "gpu_performance_stats.h", 38 "gpu_performance_stats.h",
39 "gpu_test_config.cc", 39 "gpu_test_config.cc",
40 "gpu_test_config.h", 40 "gpu_test_config.h",
41 "gpu_test_expectations_parser.cc", 41 "gpu_test_expectations_parser.cc",
42 "gpu_test_expectations_parser.h", 42 "gpu_test_expectations_parser.h",
43 "gpu_util.cc", 43 "gpu_util.cc",
44 "gpu_util.h", 44 "gpu_util.h",
45 "software_rendering_list_json.cc", 45 "software_rendering_list_json.cc",
46 ] 46 ]
47 47
48 # TODO(jschuh): size_t to int.
49 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
50
48 defines = [ "GPU_IMPLEMENTATION" ] 51 defines = [ "GPU_IMPLEMENTATION" ]
49 52
50 deps = [ 53 deps = [
51 "//base", 54 "//base",
52 "//third_party/re2", 55 "//third_party/re2",
53 "//ui/gl", 56 "//ui/gl",
54 ] 57 ]
55 58
56 # Prefer mesa GL headers to system headers, which cause problems on Win. 59 # Prefer mesa GL headers to system headers, which cause problems on Win.
57 include_dirs = [ "//third_party/mesa/src/include" ] 60 include_dirs = [ "//third_party/mesa/src/include" ]
58 61
59 if (is_win) { 62 if (is_win) {
60 deps += [ "//third_party/libxml" ] 63 deps += [ "//third_party/libxml" ]
61 libs = [ 64 libs = [
62 "dxguid.lib", 65 "dxguid.lib",
63 "setupapi.lib", 66 "setupapi.lib",
64 ] 67 ]
65 68
66 if (is_chrome_branded && is_official_build) { 69 if (is_chrome_branded && is_official_build) {
67 sources += [ 70 sources += [
68 "//third_party/amd/AmdCfxPxExt.h", 71 "//third_party/amd/AmdCfxPxExt.h",
69 "//third_party/amd/amd_videocard_info_win.cc", 72 "//third_party/amd/amd_videocard_info_win.cc",
70 ] 73 ]
71 } 74 }
72
73 # TODO(jschuh): size_t to int.
74 cflags = [ "/wd4267" ]
75 } 75 }
76 if (use_libpci) { 76 if (use_libpci) {
77 defines += [ "USE_LIBPCI=1" ] 77 defines += [ "USE_LIBPCI=1" ]
78 } 78 }
79 if (is_linux && use_libpci && (use_x11 || use_ozone)) { 79 if (is_linux && use_libpci && (use_x11 || use_ozone)) {
80 deps += [ "//build/config/linux:libpci" ] 80 deps += [ "//build/config/linux:libpci" ]
81 } 81 }
82 if (is_linux && use_x11) { 82 if (is_linux && use_x11) {
83 configs += [ 83 configs += [
84 "//build/config/linux:x11", 84 "//build/config/linux:x11",
85 "//build/config/linux:xext", 85 "//build/config/linux:xext",
86 ] 86 ]
87 deps += [ 87 deps += [
88 "//third_party/libXNVCtrl", 88 "//third_party/libXNVCtrl",
89 "//ui/gfx/x", 89 "//ui/gfx/x",
90 ] 90 ]
91 } else { 91 } else {
92 sources -= [ "gpu_info_collector_x11.cc" ] 92 sources -= [ "gpu_info_collector_x11.cc" ]
93 } 93 }
94 if (!use_ozone) { 94 if (!use_ozone) {
95 sources -= [ "gpu_info_collector_ozone.cc" ] 95 sources -= [ "gpu_info_collector_ozone.cc" ]
96 } 96 }
97 } 97 }
OLDNEW
« no previous file with comments | « gpu/command_buffer/client/BUILD.gn ('k') | media/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698