diff options
| -rw-r--r-- | chrome/app/chrome_main.cc | 5 | ||||
| -rw-r--r-- | chrome/chrome_browser.gypi | 7 | ||||
| -rw-r--r-- | chrome/chrome_exe.gypi | 32 |
3 files changed, 34 insertions, 10 deletions
diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc index a24e1b3..4d26172 100644 --- a/chrome/app/chrome_main.cc +++ b/chrome/app/chrome_main.cc @@ -79,10 +79,13 @@ #include "chrome/browser/chromeos/boot_times_loader.h" #endif -#if defined(USE_X11) +#if defined(TOOLKIT_USES_GTK) #include <gdk/gdk.h> #include <glib.h> #include <gtk/gtk.h> +#endif + +#if defined(USE_X11) #include <stdlib.h> #include <string.h> #include "ui/base/x/x11_util.h" diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index e7ae7ec..636171a 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -4141,6 +4141,13 @@ ['exclude', '^browser/ui/webui/keyboard_ui.*'], ], }], + ['OS=="linux"', { + 'link_settings': { + 'libraries': [ + '-lXss', + ], + }, + }], ['OS=="linux" and use_aura==1', { 'dependencies': [ '../build/linux/system.gyp:dbus', diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index 219fadb..6f0bfe33 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -122,15 +122,29 @@ }, ], }], - ], - 'dependencies': [ - # On Linux, link the dependencies (libraries) that make up actual - # Chromium functionality directly into the executable. - '<@(chromium_dependencies)', - # Needed for chrome_main.cc initialization of libraries. - '../build/linux/system.gyp:gtk', - # Needed to use the master_preferences functions - 'installer_util', + ['toolkit_uses_gtk == 1', { + 'dependencies': [ + # On Linux, link the dependencies (libraries) that make up actual + # Chromium functionality directly into the executable. + '<@(chromium_dependencies)', + # Needed for chrome_main.cc initialization of libraries. + '../build/linux/system.gyp:gtk', + # Needed to use the master_preferences functions + 'installer_util', + ], + }, { # else toolkit_uses_gtk == 1 + 'dependencies': [ + # On Linux, link the dependencies (libraries) that make up actual + # Chromium functionality directly into the executable. + '<@(chromium_dependencies)', + # Needed for chrome_main.cc initialization of libraries. + '../build/linux/system.gyp:x11', + '../build/linux/system.gyp:pangocairo', + '../build/linux/system.gyp:xext', + # Needed to use the master_preferences functions + 'installer_util', + ], + }], ], 'sources': [ 'app/chrome_dll_resource.h', |