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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/gpu/gpu_info_collector_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_gpu.gypi
diff --git a/content/content_gpu.gypi b/content/content_gpu.gypi
index d55093c50c433f1513acf165789c295b8adb24a4..6b05cded06fe05e42c8b4a30a9eec2341c5bd208 100644
--- a/content/content_gpu.gypi
+++ b/content/content_gpu.gypi
@@ -3,6 +3,9 @@
# found in the LICENSE file.
{
+ 'variables': {
+ 'linux_link_libpci%': 0,
+ },
'dependencies': [
'../base/base.gyp:base',
'../skia/skia.gyp:skia',
@@ -110,5 +113,22 @@
'<(DEPTH)/third_party/libva',
],
}],
+ ['linux_link_libpci==0', {
+ 'defines': [
+ 'DLOPEN_LIBPCI',
+ ],
+ }, { # linux_link_libpci==1
+ 'cflags': [
+ '<!@(pkg-config --cflags libpci)',
+ ],
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(pkg-config --libs-only-L --libs-only-other libpci)',
+ ],
+ 'libraries': [
+ '<!@(pkg-config --libs-only-l libpci)',
+ ],
+ }
+ }],
],
}
« 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