Chromium Code Reviews| Index: build/linux/system.gyp |
| =================================================================== |
| --- build/linux/system.gyp (revision 85385) |
| +++ build/linux/system.gyp (working copy) |
| @@ -212,6 +212,41 @@ |
| }]] |
| }, |
| { |
| + 'target_name': 'gio', |
| + 'type': 'settings', |
| + 'conditions': [ |
| + ['use_gio==1 and _toolset=="target"', { |
| + 'direct_dependent_settings': { |
| + 'cflags': [ |
| + '<!@(<(pkg-config) --cflags gio-2.0)', |
| + ], |
| + 'defines': [ |
| + 'USE_GIO', |
| + ], |
| + 'conditions': [ |
| + ['linux_link_gsettings==0', { |
| + 'defines': ['DLOPEN_GSETTINGS'], |
|
Paweł Hajdan Jr.
2011/05/16 05:56:34
I'm somewhat worried about this difference in name
Mike Mammarella
2011/05/16 06:08:13
Yeah, I thought about this, and wondered if I shou
|
| + }], |
| + ], |
| + }, |
| + 'link_settings': { |
| + 'ldflags': [ |
| + '<!@(<(pkg-config) --libs-only-L --libs-only-other gio-2.0)', |
| + ], |
| + 'libraries': [ |
| + '<!@(<(pkg-config) --libs-only-l gio-2.0)', |
| + ], |
| + 'conditions': [ |
| + ['linux_link_gsettings==0', { |
| + 'libraries': [ |
| + '-ldl', |
| + ], |
| + }], |
| + ], |
| + }, |
| + }]] |
| + }, |
| + { |
| 'target_name': 'x11', |
| 'type': 'settings', |
| 'conditions': [ |