Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(490)

Side by Side Diff: chrome/chrome_exe.gypi

Issue 318153002: Remove ftol workaround since we're rolled to Update2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/chrome_renderer.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 'includes': [ 559 'includes': [
560 'app/version_assembly/version_assembly_manifest_action.gypi', 560 'app/version_assembly/version_assembly_manifest_action.gypi',
561 ], 561 ],
562 }, 562 },
563 ], 563 ],
564 }, { # 'OS!="win" 564 }, { # 'OS!="win"
565 'sources!': [ 565 'sources!': [
566 'app/client_util.cc', 566 'app/client_util.cc',
567 ], 567 ],
568 }], 568 }],
569 ['OS=="win" and target_arch=="ia32"', {
570 'sources': [
571 # TODO(scottmg): This is a workaround for
572 # http://crbug.com/348525 that affects VS2013 before Update 2.
573 # This should be removed once Update 2 is released.
574 '../build/win/ftol3.obj',
575 ],
576 }],
577 ['OS=="win" and component=="shared_library"', { 569 ['OS=="win" and component=="shared_library"', {
578 'defines': ['COMPILE_CONTENT_STATICALLY'], 570 'defines': ['COMPILE_CONTENT_STATICALLY'],
579 }], 571 }],
580 ['OS=="win"', { 572 ['OS=="win"', {
581 'dependencies': [ 573 'dependencies': [
582 '../win8/metro_driver/metro_driver.gyp:metro_driver', 574 '../win8/metro_driver/metro_driver.gyp:metro_driver',
583 '../win8/delegate_execute/delegate_execute.gyp:*', 575 '../win8/delegate_execute/delegate_execute.gyp:*',
584 ], 576 ],
585 }], 577 }],
586 ], 578 ],
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
693 'dependencies': [ 685 'dependencies': [
694 'chrome_nacl_win64', 686 'chrome_nacl_win64',
695 ], 687 ],
696 }], 688 }],
697 ], 689 ],
698 }, 690 },
699 ], 691 ],
700 }], 692 }],
701 ], 693 ],
702 } 694 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/chrome_renderer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698