summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-05 20:18:06 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-05 20:18:06 +0000
commit2a078fbc13cd575bbb1ac5d5978d0fe43e03615c (patch)
tree5c80365e04d76b6442569e8c73eb4e4510afcd94 /build
parent361a5f1f4e6c9f598f2476c7d03986065a61ab83 (diff)
downloadchromium_src-2a078fbc13cd575bbb1ac5d5978d0fe43e03615c.zip
chromium_src-2a078fbc13cd575bbb1ac5d5978d0fe43e03615c.tar.gz
chromium_src-2a078fbc13cd575bbb1ac5d5978d0fe43e03615c.tar.bz2
aura: Build aura_builder on linux.
. aura is never built with gtk anymore. So it's not necesary to disable GTK events in the message-pump. . Make sure glib headers are included when building non-gtk aura. . Update the 'glib' target to include gobject-2.0 and gthread-2.0 packages. BUG=none TEST=aura_builder builds on linux with use_aura=1 Review URL: http://codereview.chromium.org/8144009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/linux/system.gyp12
1 files changed, 6 insertions, 6 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index 1e534f5..e8e3287 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -473,29 +473,29 @@
['_toolset=="target"', {
'direct_dependent_settings': {
'cflags': [
- '<!@(<(pkg-config) --cflags glib-2.0)',
+ '<!@(<(pkg-config) --cflags glib-2.0 gobject-2.0 gthread-2.0)',
],
},
'link_settings': {
'ldflags': [
- '<!@(<(pkg-config) --libs-only-L --libs-only-other glib-2.0)',
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other glib-2.0 gobject-2.0 gthread-2.0)',
],
'libraries': [
- '<!@(<(pkg-config) --libs-only-l glib-2.0)',
+ '<!@(<(pkg-config) --libs-only-l glib-2.0 gobject-2.0 gthread-2.0)',
],
},
}, {
'direct_dependent_settings': {
'cflags': [
- '<!@(pkg-config --cflags glib-2.0)',
+ '<!@(pkg-config --cflags glib-2.0 gobject-2.0 gthread-2.0)',
],
},
'link_settings': {
'ldflags': [
- '<!@(pkg-config --libs-only-L --libs-only-other glib-2.0)',
+ '<!@(pkg-config --libs-only-L --libs-only-other glib-2.0 gobject-2.0 gthread-2.0)',
],
'libraries': [
- '<!@(pkg-config --libs-only-l glib-2.0)',
+ '<!@(pkg-config --libs-only-l glib-2.0 gobject-2.0 gthread-2.0)',
],
},
}],