Chromium Code Reviews| Index: chrome/chrome_exe.gypi |
| diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi |
| index 219fadb89e0504445bdad37d5af89d47d285ad0a..6f0bfe33dbf8804d59e9f36ccdfa99c56819c886 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', |
| + ], |
| + }], |
|
mattm
2011/10/05 02:27:51
unrelated?
|
| ], |
| 'sources': [ |
| 'app/chrome_dll_resource.h', |