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

Side by Side Diff: chrome/chrome_exe.gypi

Issue 10704135: Use #pragma comment(lib, "userenv.lib") rather than AdditionalDependencies. It's better. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: relocated pragma Created 8 years, 5 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/app/breakpad_win.cc ('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) 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': 'executable', 9 'type': 'executable',
10 'mac_bundle': 1, 10 'mac_bundle': 1,
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 '../breakpad/breakpad.gyp:breakpad_sender', 457 '../breakpad/breakpad.gyp:breakpad_sender',
458 '../sandbox/sandbox.gyp:sandbox', 458 '../sandbox/sandbox.gyp:sandbox',
459 'app/policy/cloud_policy_codegen.gyp:policy', 459 'app/policy/cloud_policy_codegen.gyp:policy',
460 ], 460 ],
461 'sources': [ 461 'sources': [
462 'app/chrome_exe.rc', 462 'app/chrome_exe.rc',
463 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_exe_version.rc', 463 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_exe_version.rc',
464 ], 464 ],
465 'msvs_settings': { 465 'msvs_settings': {
466 'VCLinkerTool': { 466 'VCLinkerTool': {
467 'AdditionalDependencies': [
468 'userenv.lib',
469 ],
470 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib', 467 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib',
471 'ProgramDatabaseFile': '$(OutDir)\\chrome_exe.pdb', 468 'ProgramDatabaseFile': '$(OutDir)\\chrome_exe.pdb',
472 'DelayLoadDLLs': [ 469 'DelayLoadDLLs': [
473 'dbghelp.dll', 470 'dbghelp.dll',
474 'dwmapi.dll', 471 'dwmapi.dll',
475 'uxtheme.dll', 472 'uxtheme.dll',
476 'ole32.dll', 473 'ole32.dll',
477 'oleaut32.dll', 474 'oleaut32.dll',
478 ], 475 ],
479 # Set /SUBSYSTEM:WINDOWS for chrome.exe itself. 476 # Set /SUBSYSTEM:WINDOWS for chrome.exe itself.
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
558 ], 555 ],
559 'defines': [ 556 'defines': [
560 '<@(nacl_win64_defines)', 557 '<@(nacl_win64_defines)',
561 'COMPILE_CONTENT_STATICALLY', 558 'COMPILE_CONTENT_STATICALLY',
562 ], 559 ],
563 'include_dirs': [ 560 'include_dirs': [
564 '<(SHARED_INTERMEDIATE_DIR)/chrome', 561 '<(SHARED_INTERMEDIATE_DIR)/chrome',
565 ], 562 ],
566 'msvs_settings': { 563 'msvs_settings': {
567 'VCLinkerTool': { 564 'VCLinkerTool': {
568 'AdditionalDependencies': [
569 'userenv.lib',
570 ],
571 'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib', 565 'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib',
572 'ProgramDatabaseFile': '$(OutDir)\\nacl64_exe.pdb', 566 'ProgramDatabaseFile': '$(OutDir)\\nacl64_exe.pdb',
573 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 567 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
574 }, 568 },
575 }, 569 },
576 'configurations': { 570 'configurations': {
577 'Common_Base': { 571 'Common_Base': {
578 'msvs_target_platform': 'x64', 572 'msvs_target_platform': 'x64',
579 }, 573 },
580 }, 574 },
581 }, 575 },
582 ], 576 ],
583 }, { # else (disable_nacl==1) 577 }, { # else (disable_nacl==1)
584 'targets': [ 578 'targets': [
585 { 579 {
586 'target_name': 'chrome_nacl_win64', 580 'target_name': 'chrome_nacl_win64',
587 'type': 'none', 581 'type': 'none',
588 'sources': [], 582 'sources': [],
589 }, 583 },
590 ], 584 ],
591 }], 585 }],
592 ], 586 ],
593 }], 587 }],
594 ], 588 ],
595 } 589 }
OLDNEW
« no previous file with comments | « chrome/app/breakpad_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698