Index: build/linux/system.gyp |
diff --git a/build/linux/system.gyp b/build/linux/system.gyp |
index bfef936e1f443c5761a037808de3d27909b3fe89..8c0c0d19cdbdef213fc6473af77fc461e98eab2b 100644 |
--- a/build/linux/system.gyp |
+++ b/build/linux/system.gyp |
@@ -330,9 +330,7 @@ |
}, |
}], |
['use_x11==1', { |
- 'link_settings': { |
- 'libraries': [ '-lXtst' ] |
- } |
+ 'dependencies': [ 'xtst' ], |
}], |
], |
}, |
@@ -797,6 +795,69 @@ |
], |
}, |
{ |
+ 'target_name': 'xcursor', |
+ 'type': 'none', |
+ 'conditions': [ |
+ ['_toolset=="target"', { |
piman
2014/02/04 00:25:14
nit: you don't need that conditional if you don't
|
+ 'direct_dependent_settings': { |
+ 'cflags': [ |
+ '<!@(<(pkg-config) --cflags xcursor)', |
+ ], |
+ }, |
+ 'link_settings': { |
+ 'ldflags': [ |
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other xcursor)', |
+ ], |
+ 'libraries': [ |
+ '<!@(<(pkg-config) --libs-only-l xcursor)', |
+ ], |
+ }, |
+ }], |
+ ], |
+ }, |
+ { |
+ 'target_name': 'xcomposite', |
+ 'type': 'none', |
+ 'conditions': [ |
+ ['_toolset=="target"', { |
+ 'direct_dependent_settings': { |
+ 'cflags': [ |
+ '<!@(<(pkg-config) --cflags xcomposite)', |
+ ], |
+ }, |
+ 'link_settings': { |
+ 'ldflags': [ |
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other xcomposite)', |
+ ], |
+ 'libraries': [ |
+ '<!@(<(pkg-config) --libs-only-l xcomposite)', |
+ ], |
+ }, |
+ }], |
+ ], |
+ }, |
+ { |
+ 'target_name': 'xdamage', |
+ 'type': 'none', |
+ 'conditions': [ |
+ ['_toolset=="target"', { |
+ 'direct_dependent_settings': { |
+ 'cflags': [ |
+ '<!@(<(pkg-config) --cflags xdamage)', |
+ ], |
+ }, |
+ 'link_settings': { |
+ 'ldflags': [ |
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other xdamage)', |
+ ], |
+ 'libraries': [ |
+ '<!@(<(pkg-config) --libs-only-l xdamage)', |
+ ], |
+ }, |
+ }], |
+ ], |
+ }, |
+ { |
'target_name': 'xext', |
'type': 'none', |
'conditions': [ |
@@ -839,6 +900,27 @@ |
], |
}, |
{ |
+ 'target_name': 'xi', |
+ 'type': 'none', |
+ 'conditions': [ |
+ ['_toolset=="target"', { |
+ 'direct_dependent_settings': { |
+ 'cflags': [ |
+ '<!@(<(pkg-config) --cflags xi)', |
+ ], |
+ }, |
+ 'link_settings': { |
+ 'ldflags': [ |
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other xi)', |
+ ], |
+ 'libraries': [ |
+ '<!@(<(pkg-config) --libs-only-l xi)', |
+ ], |
+ }, |
+ }], |
+ ], |
+ }, |
+ { |
'target_name': 'xrandr', |
'type': 'none', |
'toolsets': ['host', 'target'], |
@@ -874,5 +956,47 @@ |
}], |
], |
}, |
+ { |
+ 'target_name': 'xrender', |
+ 'type': 'none', |
+ 'conditions': [ |
+ ['_toolset=="target"', { |
+ 'direct_dependent_settings': { |
+ 'cflags': [ |
+ '<!@(<(pkg-config) --cflags xrender)', |
+ ], |
+ }, |
+ 'link_settings': { |
+ 'ldflags': [ |
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other xrender)', |
+ ], |
+ 'libraries': [ |
+ '<!@(<(pkg-config) --libs-only-l xrender)', |
+ ], |
+ }, |
+ }], |
+ ], |
+ }, |
+ { |
+ 'target_name': 'xtst', |
+ 'type': 'none', |
+ 'conditions': [ |
+ ['_toolset=="target"', { |
+ 'direct_dependent_settings': { |
+ 'cflags': [ |
+ '<!@(<(pkg-config) --cflags xtst)', |
+ ], |
+ }, |
+ 'link_settings': { |
+ 'ldflags': [ |
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other xtst)', |
+ ], |
+ 'libraries': [ |
+ '<!@(<(pkg-config) --libs-only-l xtst)', |
+ ], |
+ }, |
+ }], |
+ ], |
+ } |
], |
} |