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

Side by Side Diff: content/content_gpu.gypi

Issue 11343015: Linux: add option to link libpci directly instead of using dlopen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | content/gpu/gpu_info_collector_linux.cc » ('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 (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': {
7 'linux_link_libpci%': 0,
8 },
6 'dependencies': [ 9 'dependencies': [
7 '../base/base.gyp:base', 10 '../base/base.gyp:base',
8 '../skia/skia.gyp:skia', 11 '../skia/skia.gyp:skia',
9 '../ui/gl/gl.gyp:gl', 12 '../ui/gl/gl.gyp:gl',
10 ], 13 ],
11 'sources': [ 14 'sources': [
12 'gpu/gpu_dx_diagnostics_win.cc', 15 'gpu/gpu_dx_diagnostics_win.cc',
13 'gpu/gpu_info_collector_android.cc', 16 'gpu/gpu_info_collector_android.cc',
14 'gpu/gpu_info_collector_linux.cc', 17 'gpu/gpu_info_collector_linux.cc',
15 'gpu/gpu_info_collector_mac.mm', 18 'gpu/gpu_info_collector_mac.mm',
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 ['target_arch=="arm" and chromeos == 1', { 106 ['target_arch=="arm" and chromeos == 1', {
104 'include_dirs': [ 107 'include_dirs': [
105 '<(DEPTH)/third_party/openmax/il', 108 '<(DEPTH)/third_party/openmax/il',
106 ], 109 ],
107 }], 110 }],
108 ['target_arch!="arm" and chromeos == 1', { 111 ['target_arch!="arm" and chromeos == 1', {
109 'include_dirs': [ 112 'include_dirs': [
110 '<(DEPTH)/third_party/libva', 113 '<(DEPTH)/third_party/libva',
111 ], 114 ],
112 }], 115 }],
116 ['linux_link_libpci==0', {
117 'defines': [
118 'DLOPEN_LIBPCI',
119 ],
120 }, { # linux_link_libpci==1
121 'cflags': [
122 '<!@(pkg-config --cflags libpci)',
123 ],
124 'link_settings': {
125 'ldflags': [
126 '<!@(pkg-config --libs-only-L --libs-only-other libpci)',
127 ],
128 'libraries': [
129 '<!@(pkg-config --libs-only-l libpci)',
130 ],
131 }
132 }],
113 ], 133 ],
114 } 134 }
OLDNEW
« no previous file with comments | « no previous file | content/gpu/gpu_info_collector_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698