| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 'variables': { | 6 'variables': { |
| 7 # TODO(dmaclach): can we pick this up some other way? Right now it's | 7 # TODO(dmaclach): can we pick this up some other way? Right now it's |
| 8 # duplicated from chrome.gyp | 8 # duplicated from chrome.gyp |
| 9 'chromium_code': 1, | 9 'chromium_code': 1, |
| 10 | 10 |
| (...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 537 '-e', 'DAEMON_CONTROLLER_CLSID="<(daemon_controller_clsid)"', | 537 '-e', 'DAEMON_CONTROLLER_CLSID="<(daemon_controller_clsid)"', |
| 538 '<(RULE_INPUT_PATH)', | 538 '<(RULE_INPUT_PATH)', |
| 539 '<@(_outputs)', | 539 '<@(_outputs)', |
| 540 ], | 540 ], |
| 541 'process_outputs_as_sources': 1, | 541 'process_outputs_as_sources': 1, |
| 542 'message': 'Generating <@(_outputs)' | 542 'message': 'Generating <@(_outputs)' |
| 543 }, | 543 }, |
| 544 ], | 544 ], |
| 545 }, # end of target 'remoting_elevated_controller' | 545 }, # end of target 'remoting_elevated_controller' |
| 546 { | 546 { |
| 547 'target_name': 'remoting_configurer', |
| 548 'type': 'executable', |
| 549 'dependencies': [ |
| 550 '../base/base.gyp:base', |
| 551 '../crypto/crypto.gyp:crypto', |
| 552 'remoting_host', |
| 553 'remoting_host_setup_base', |
| 554 ], |
| 555 'sources': [ |
| 556 'host/branding.cc', |
| 557 'host/setup/win/host_configurer.cc', |
| 558 'host/setup/win/host_configurer.rc', |
| 559 'host/setup/win/host_configurer_window.cc', |
| 560 'host/setup/win/host_configurer_window.h', |
| 561 'host/setup/win/host_configurer_resource.h', |
| 562 'host/setup/win/load_string_from_resource.cc', |
| 563 'host/setup/win/load_string_from_resource.h', |
| 564 'host/setup/win/start_host_window.cc', |
| 565 'host/setup/win/start_host_window.h', |
| 566 ], |
| 567 'msvs_settings': { |
| 568 'VCLinkerTool': { |
| 569 'AdditionalOptions': [ |
| 570 "\"/manifestdependency:type='win32' " |
| 571 "name='Microsoft.Windows.Common-Controls' " |
| 572 "version='6.0.0.0' " |
| 573 "processorArchitecture='*' " |
| 574 "publicKeyToken='6595b64144ccf1df' language='*'\"", |
| 575 ], |
| 576 # 2 == /SUBSYSTEM:WINDOWS |
| 577 'SubSystem': '2', |
| 578 }, |
| 579 }, |
| 580 }, # end of target 'remoting_configurer' |
| 581 { |
| 547 'target_name': 'remoting_controller', | 582 'target_name': 'remoting_controller', |
| 548 'type': 'executable', | 583 'type': 'executable', |
| 549 'variables': { 'enable_wexit_time_destructors': 1, }, | 584 'variables': { 'enable_wexit_time_destructors': 1, }, |
| 550 'defines' : [ | 585 'defines' : [ |
| 551 '_ATL_APARTMENT_THREADED', | 586 '_ATL_APARTMENT_THREADED', |
| 552 '_ATL_NO_AUTOMATIC_NAMESPACE', | 587 '_ATL_NO_AUTOMATIC_NAMESPACE', |
| 553 '_ATL_CSTRING_EXPLICIT_CONSTRUCTORS', | 588 '_ATL_CSTRING_EXPLICIT_CONSTRUCTORS', |
| 554 'STRICT', | 589 'STRICT', |
| 555 'DAEMON_CONTROLLER_CLSID="{<(daemon_controller_clsid)}"', | 590 'DAEMON_CONTROLLER_CLSID="{<(daemon_controller_clsid)}"', |
| 556 ], | 591 ], |
| (...skipping 1607 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2164 '../base/allocator/allocator.gyp:allocator', | 2199 '../base/allocator/allocator.gyp:allocator', |
| 2165 ], | 2200 ], |
| 2166 }, | 2201 }, |
| 2167 ], | 2202 ], |
| 2168 ], | 2203 ], |
| 2169 }], # end of 'toolkit_uses_gtk == 1' | 2204 }], # end of 'toolkit_uses_gtk == 1' |
| 2170 ], # end of 'conditions' | 2205 ], # end of 'conditions' |
| 2171 }, # end of target 'remoting_unittests' | 2206 }, # end of target 'remoting_unittests' |
| 2172 ], # end of targets | 2207 ], # end of targets |
| 2173 } | 2208 } |
| OLD | NEW |