| 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 'targets': [ | 6 'targets': [ |
| 7 { | 7 { |
| 8 'target_name': 'chrome', | 8 'target_name': 'chrome', |
| 9 'type': 'none', | 9 'type': 'none', |
| 10 'dependencies': [ 'chrome_initial', ], | 10 'dependencies': [ 'chrome_initial', ], |
| (...skipping 561 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 572 'includes': [ | 572 'includes': [ |
| 573 'app/version_assembly/version_assembly_manifest_action.gypi', | 573 'app/version_assembly/version_assembly_manifest_action.gypi', |
| 574 ], | 574 ], |
| 575 }, | 575 }, |
| 576 ], | 576 ], |
| 577 }, { # 'OS!="win" | 577 }, { # 'OS!="win" |
| 578 'sources!': [ | 578 'sources!': [ |
| 579 'app/client_util.cc', | 579 'app/client_util.cc', |
| 580 ], | 580 ], |
| 581 }], | 581 }], |
| 582 ['OS=="win" and target_arch=="ia32"', { |
| 583 'sources': [ |
| 584 # TODO(scottmg): This is a workaround for |
| 585 # http://crbug.com/348525 that affects VS2013 before Update 2. |
| 586 # This should be removed once Update 2 is released. |
| 587 '../build/win/ftol3.obj', |
| 588 ], |
| 589 }], |
| 582 ['OS=="win" and component=="shared_library"', { | 590 ['OS=="win" and component=="shared_library"', { |
| 583 'defines': ['COMPILE_CONTENT_STATICALLY'], | 591 'defines': ['COMPILE_CONTENT_STATICALLY'], |
| 584 }], | 592 }], |
| 585 ['OS=="win"', { | 593 ['OS=="win"', { |
| 586 'dependencies': [ | 594 'dependencies': [ |
| 587 '../win8/metro_driver/metro_driver.gyp:metro_driver', | 595 '../win8/metro_driver/metro_driver.gyp:metro_driver', |
| 588 '../win8/delegate_execute/delegate_execute.gyp:*', | 596 '../win8/delegate_execute/delegate_execute.gyp:*', |
| 589 ], | 597 ], |
| 590 }], | 598 }], |
| 591 ], | 599 ], |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 691 'dependencies': [ | 699 'dependencies': [ |
| 692 'chrome_nacl_win64', | 700 'chrome_nacl_win64', |
| 693 ], | 701 ], |
| 694 }], | 702 }], |
| 695 ], | 703 ], |
| 696 }, | 704 }, |
| 697 ], | 705 ], |
| 698 }], | 706 }], |
| 699 ], | 707 ], |
| 700 } | 708 } |
| OLD | NEW |