diff options
Diffstat (limited to 'build/linux')
| -rw-r--r-- | build/linux/system.gyp | 72 |
1 files changed, 56 insertions, 16 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp index e87e1a7..3b667d0 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -31,6 +31,7 @@ { 'target_name': 'gtk', 'type': 'settings', + 'toolsets': ['host', 'target'], 'conditions': [ ['_toolset=="target"', { 'direct_dependent_settings': { @@ -46,12 +47,27 @@ '<!@(<(pkg-config) --libs-only-l gtk+-2.0 gthread-2.0)', ], }, - }], - [ 'chromeos==1', { - 'link_settings': { - 'libraries': [ '-lXtst' ] - } - }]] + }, { + 'direct_dependent_settings': { + 'cflags': [ + '<!@(pkg-config --cflags gtk+-2.0 gthread-2.0)', + ], + }, + 'link_settings': { + 'ldflags': [ + '<!@(pkg-config --libs-only-L --libs-only-other gtk+-2.0 gthread-2.0)', + ], + 'libraries': [ + '<!@(pkg-config --libs-only-l gtk+-2.0 gthread-2.0)', + ], + }, + }], + ['chromeos==1', { + 'link_settings': { + 'libraries': [ '-lXtst' ] + } + }], + ], }, { 'target_name': 'gtkprint', @@ -71,7 +87,8 @@ '<!@(<(pkg-config) --libs-only-l gtk+-unix-print-2.0)', ], }, - }]] + }], + ], }, { 'target_name': 'ssl', @@ -152,7 +169,8 @@ '<!@(<(pkg-config) --libs-only-l freetype2)', ], }, - }]] + }], + ], }, { 'target_name': 'fontconfig', @@ -172,7 +190,8 @@ '<!@(<(pkg-config) --libs-only-l fontconfig)', ], }, - }]] + }], + ], }, { 'target_name': 'gdk', @@ -192,7 +211,8 @@ '<!@(<(pkg-config) --libs-only-l gdk-2.0)', ], }, - }]] + }], + ], }, { 'target_name': 'gconf', @@ -215,7 +235,8 @@ '<!@(<(pkg-config) --libs-only-l gconf-2.0)', ], }, - }]] + }], + ], }, { 'target_name': 'gio', @@ -250,11 +271,13 @@ }], ], }, - }]] + }], + ], }, { 'target_name': 'x11', 'type': 'settings', + 'toolsets': ['host', 'target'], 'conditions': [ ['_toolset=="target"', { 'direct_dependent_settings': { @@ -270,7 +293,21 @@ '<!@(<(pkg-config) --libs-only-l x11 xi)', ], }, - }], + }, { + 'direct_dependent_settings': { + 'cflags': [ + '<!@(pkg-config --cflags x11)', + ], + }, + 'link_settings': { + 'ldflags': [ + '<!@(pkg-config --libs-only-L --libs-only-other x11 xi)', + ], + 'libraries': [ + '<!@(pkg-config --libs-only-l x11 xi)', + ], + }, + }], ], }, { @@ -291,7 +328,8 @@ '<!@(<(pkg-config) --libs-only-l xext)', ], }, - }]] + }], + ], }, { 'target_name': 'libgcrypt', @@ -308,7 +346,8 @@ '<!@(libgcrypt-config --libs)', ], }, - }]] + }], + ], }, { 'target_name': 'selinux', @@ -320,7 +359,8 @@ '-lselinux', ], }, - }]] + }], + ], }, { 'target_name': 'gnome_keyring', |