diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-05 20:18:06 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-05 20:18:06 +0000 |
| commit | 2a078fbc13cd575bbb1ac5d5978d0fe43e03615c (patch) | |
| tree | 5c80365e04d76b6442569e8c73eb4e4510afcd94 /views/desktop | |
| parent | 361a5f1f4e6c9f598f2476c7d03986065a61ab83 (diff) | |
| download | chromium_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 'views/desktop')
| -rw-r--r-- | views/desktop/desktop_main.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/views/desktop/desktop_main.cc b/views/desktop/desktop_main.cc index a19cc4d..225a970 100644 --- a/views/desktop/desktop_main.cc +++ b/views/desktop/desktop_main.cc @@ -24,6 +24,13 @@ #include "ui/wayland/wayland_message_pump.h" #endif +#if defined(TOOLKIT_USES_GTK) +#include <gtk/gtk.h> +#elif defined(OS_LINUX) +#include <glib.h> +#include <glib-object.h> +#endif + int main(int argc, char** argv) { #if defined(OS_WIN) OleInitialize(NULL); @@ -31,7 +38,7 @@ int main(int argc, char** argv) { // Initializes gtk stuff. g_thread_init(NULL); g_type_init(); -#if !defined(USE_WAYLAND) +#if defined(TOOLKIT_USES_GTK) && !defined(USE_WAYLAND) gtk_init(&argc, &argv); #endif #endif |