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

Side by Side Diff: chrome/chrome_exe.gypi

Issue 311413003: Add a win_force_console=1 GYP flag that makes chrome.exe and nacl64.exe console applications (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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
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 500 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 'OutputFile': '$(OutDir)\\initialexe\\chrome.exe', 511 'OutputFile': '$(OutDir)\\initialexe\\chrome.exe',
512 'DelayLoadDLLs': [ 512 'DelayLoadDLLs': [
513 'dbghelp.dll', 513 'dbghelp.dll',
514 'dwmapi.dll', 514 'dwmapi.dll',
515 'uxtheme.dll', 515 'uxtheme.dll',
516 'ole32.dll', 516 'ole32.dll',
517 'oleaut32.dll', 517 'oleaut32.dll',
518 ], 518 ],
519 'AdditionalDependencies': [ 'wintrust.lib' ], 519 'AdditionalDependencies': [ 'wintrust.lib' ],
520 'conditions': [ 520 'conditions': [
521 ['asan==0', { 521 ['win_force_console==0', {
522 # Set /SUBSYSTEM:WINDOWS for chrome.exe itself, except for the
523 # AddressSanitizer build where console output is important.
524 'SubSystem': '2', 522 'SubSystem': '2',
525 }], 523 }],
526 ], 524 ],
527 }, 525 },
528 'VCManifestTool': { 526 'VCManifestTool': {
529 'AdditionalManifestFiles': [ 527 'AdditionalManifestFiles': [
530 '$(ProjectDir)\\app\\chrome.exe.manifest', 528 '$(ProjectDir)\\app\\chrome.exe.manifest',
531 '<(SHARED_INTERMEDIATE_DIR)/chrome/app/version_assembly/version_ assembly.manifest', 529 '<(SHARED_INTERMEDIATE_DIR)/chrome/app/version_assembly/version_ assembly.manifest',
532 ], 530 ],
533 }, 531 },
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 'defines': [ 639 'defines': [
642 '<@(nacl_win64_defines)', 640 '<@(nacl_win64_defines)',
643 'COMPILE_CONTENT_STATICALLY', 641 'COMPILE_CONTENT_STATICALLY',
644 ], 642 ],
645 'include_dirs': [ 643 'include_dirs': [
646 '<(SHARED_INTERMEDIATE_DIR)/chrome', 644 '<(SHARED_INTERMEDIATE_DIR)/chrome',
647 ], 645 ],
648 'msvs_settings': { 646 'msvs_settings': {
649 'VCLinkerTool': { 647 'VCLinkerTool': {
650 'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib', 648 'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib',
651 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 649 'conditions': [
650 ['win_force_console==0', {
651 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
652 }],
653 ],
652 }, 654 },
653 }, 655 },
654 'configurations': { 656 'configurations': {
655 'Common_Base': { 657 'Common_Base': {
656 'msvs_target_platform': 'x64', 658 'msvs_target_platform': 'x64',
657 }, 659 },
658 }, 660 },
659 'conditions': [ 661 'conditions': [
660 ['configuration_policy==1', { 662 ['configuration_policy==1', {
661 'dependencies': [ 663 'dependencies': [
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
696 'dependencies': [ 698 'dependencies': [
697 'chrome_nacl_win64', 699 'chrome_nacl_win64',
698 ], 700 ],
699 }], 701 }],
700 ], 702 ],
701 }, 703 },
702 ], 704 ],
703 }], 705 }],
704 ], 706 ],
705 } 707 }
OLDNEW
« build/common.gypi ('K') | « chrome/chrome_dll.gypi ('k') | chrome/nacl/nacl_exe_win_64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698