Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'targets': [ | 6 'targets': [ |
| 7 { | 7 { |
| 8 'target_name': 'chrome', | 8 'target_name': 'chrome', |
| 9 'type': 'executable', | 9 'type': 'executable', |
| 10 'mac_bundle': 1, | 10 'mac_bundle': 1, |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 115 'conditions': [ | 115 'conditions': [ |
| 116 ['branding=="Chrome"', { | 116 ['branding=="Chrome"', { |
| 117 'files': ['app/theme/google_chrome/product_logo_48.png'] | 117 'files': ['app/theme/google_chrome/product_logo_48.png'] |
| 118 }, { # else: 'branding!="Chrome" | 118 }, { # else: 'branding!="Chrome" |
| 119 'files': ['app/theme/chromium/product_logo_48.png'] | 119 'files': ['app/theme/chromium/product_logo_48.png'] |
| 120 }], | 120 }], |
| 121 ], | 121 ], |
| 122 }, | 122 }, |
| 123 ], | 123 ], |
| 124 }], | 124 }], |
| 125 ], | 125 ['toolkit_uses_gtk == 1', { |
| 126 'dependencies': [ | 126 'dependencies': [ |
| 127 # On Linux, link the dependencies (libraries) that make up actual | 127 # On Linux, link the dependencies (libraries) that make up actua l |
| 128 # Chromium functionality directly into the executable. | 128 # Chromium functionality directly into the executable. |
| 129 '<@(chromium_dependencies)', | 129 '<@(chromium_dependencies)', |
| 130 # Needed for chrome_main.cc initialization of libraries. | 130 # Needed for chrome_main.cc initialization of libraries. |
| 131 '../build/linux/system.gyp:gtk', | 131 '../build/linux/system.gyp:gtk', |
| 132 # Needed to use the master_preferences functions | 132 # Needed to use the master_preferences functions |
| 133 'installer_util', | 133 'installer_util', |
| 134 ], | |
| 135 }, { # else toolkit_uses_gtk == 1 | |
| 136 'dependencies': [ | |
| 137 # On Linux, link the dependencies (libraries) that make up actua l | |
| 138 # Chromium functionality directly into the executable. | |
| 139 '<@(chromium_dependencies)', | |
| 140 # Needed for chrome_main.cc initialization of libraries. | |
| 141 '../build/linux/system.gyp:x11', | |
| 142 '../build/linux/system.gyp:pangocairo', | |
| 143 '../build/linux/system.gyp:xext', | |
| 144 # Needed to use the master_preferences functions | |
| 145 'installer_util', | |
| 146 ], | |
| 147 }], | |
|
mattm
2011/10/05 02:27:51
unrelated?
| |
| 134 ], | 148 ], |
| 135 'sources': [ | 149 'sources': [ |
| 136 'app/chrome_dll_resource.h', | 150 'app/chrome_dll_resource.h', |
| 137 'app/chrome_main.cc', | 151 'app/chrome_main.cc', |
| 138 ], | 152 ], |
| 139 }], | 153 }], |
| 140 ['OS=="mac"', { | 154 ['OS=="mac"', { |
| 141 # 'branding' is a variable defined in common.gypi | 155 # 'branding' is a variable defined in common.gypi |
| 142 # (e.g. "Chromium", "Chrome") | 156 # (e.g. "Chromium", "Chrome") |
| 143 'conditions': [ | 157 'conditions': [ |
| (...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 536 'configurations': { | 550 'configurations': { |
| 537 'Common_Base': { | 551 'Common_Base': { |
| 538 'msvs_target_platform': 'x64', | 552 'msvs_target_platform': 'x64', |
| 539 }, | 553 }, |
| 540 }, | 554 }, |
| 541 }, | 555 }, |
| 542 ], | 556 ], |
| 543 }], | 557 }], |
| 544 ], | 558 ], |
| 545 } | 559 } |
| OLD | NEW |