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

Side by Side Diff: chrome/chrome_exe.gypi

Issue 7670031: restore OutputFile for chrome.exe, do moving hardlink on dll instead (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: use initial instead of incremental to coexist with syzygy flag Created 9 years, 4 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_dll.gypi ('k') | no next file » | 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) 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 'target_defaults': { 6 'target_defaults': {
7 'variables': { 7 'variables': {
8 'chrome_exe_target': 0, 8 'chrome_exe_target': 0,
9 }, 9 },
10 'target_conditions': [ 10 'target_conditions': [
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 'app/chrome_exe.rc', 444 'app/chrome_exe.rc',
445 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_exe_version.rc', 445 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_exe_version.rc',
446 ], 446 ],
447 'msvs_settings': { 447 'msvs_settings': {
448 'VCLinkerTool': { 448 'VCLinkerTool': {
449 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib', 449 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib',
450 'ProgramDatabaseFile': '$(OutDir)\\chrome_exe.pdb', 450 'ProgramDatabaseFile': '$(OutDir)\\chrome_exe.pdb',
451 }, 451 },
452 }, 452 },
453 }], 453 }],
454
455 # Linking to $(IntDir) and then hard-linking back to $(OutDir) is a
456 # workaround to avoid having the .ilk files for chrome.dll and
457 # chrome.exe conflicting. See http://crbug.com/92528 for background.
458 # Only done on 2008 currently because msvs_postbuild isn't implemented
459 # on 2010 yet, and this hack may not be required there anyway.
460 ['OS=="win" and MSVS_VERSION=="2008"', {
461 'msvs_settings': {
462 'VCLinkerTool': {
463 'OutputFile': '$(IntDir)\\chrome.exe',
464 },
465 },
466 'msvs_postbuild': 'tools\\build\\win\\hardlink_failsafe.bat $(IntDir)\ \chrome.exe $(OutDir)\\chrome.exe'
467 }],
468 ], 454 ],
469 }, 455 },
470 ], 456 ],
471 'conditions': [ 457 'conditions': [
472 ['OS=="win"', { 458 ['OS=="win"', {
473 'targets': [ 459 'targets': [
474 { 460 {
475 'target_name': 'chrome_nacl_win64', 461 'target_name': 'chrome_nacl_win64',
476 'type': 'executable', 462 'type': 'executable',
477 'product_name': 'nacl64', 463 'product_name': 'nacl64',
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 'configurations': { 497 'configurations': {
512 'Common_Base': { 498 'Common_Base': {
513 'msvs_target_platform': 'x64', 499 'msvs_target_platform': 'x64',
514 }, 500 },
515 }, 501 },
516 }, 502 },
517 ], 503 ],
518 }], 504 }],
519 ], 505 ],
520 } 506 }
OLDNEW
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698