| 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': 'executable', | 9 'type': 'executable', |
| 10 'mac_bundle': 1, | 10 'mac_bundle': 1, |
| (...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 472 '../sandbox/sandbox.gyp:sandbox', | 472 '../sandbox/sandbox.gyp:sandbox', |
| 473 'app/policy/cloud_policy_codegen.gyp:policy', | 473 'app/policy/cloud_policy_codegen.gyp:policy', |
| 474 ], | 474 ], |
| 475 'sources': [ | 475 'sources': [ |
| 476 'app/chrome_exe.rc', | 476 'app/chrome_exe.rc', |
| 477 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_exe_version.rc', | 477 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_exe_version.rc', |
| 478 ], | 478 ], |
| 479 'msvs_settings': { | 479 'msvs_settings': { |
| 480 'VCLinkerTool': { | 480 'VCLinkerTool': { |
| 481 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib', | 481 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib', |
| 482 'ProgramDatabaseFile': '$(OutDir)\\chrome_exe.pdb', | |
| 483 'DelayLoadDLLs': [ | 482 'DelayLoadDLLs': [ |
| 484 'dbghelp.dll', | 483 'dbghelp.dll', |
| 485 'dwmapi.dll', | 484 'dwmapi.dll', |
| 486 'uxtheme.dll', | 485 'uxtheme.dll', |
| 487 'ole32.dll', | 486 'ole32.dll', |
| 488 'oleaut32.dll', | 487 'oleaut32.dll', |
| 489 ], | 488 ], |
| 490 # Set /SUBSYSTEM:WINDOWS for chrome.exe itself. | 489 # Set /SUBSYSTEM:WINDOWS for chrome.exe itself. |
| 491 'SubSystem': '2', | 490 'SubSystem': '2', |
| 492 }, | 491 }, |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 577 'defines': [ | 576 'defines': [ |
| 578 '<@(nacl_win64_defines)', | 577 '<@(nacl_win64_defines)', |
| 579 'COMPILE_CONTENT_STATICALLY', | 578 'COMPILE_CONTENT_STATICALLY', |
| 580 ], | 579 ], |
| 581 'include_dirs': [ | 580 'include_dirs': [ |
| 582 '<(SHARED_INTERMEDIATE_DIR)/chrome', | 581 '<(SHARED_INTERMEDIATE_DIR)/chrome', |
| 583 ], | 582 ], |
| 584 'msvs_settings': { | 583 'msvs_settings': { |
| 585 'VCLinkerTool': { | 584 'VCLinkerTool': { |
| 586 'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib', | 585 'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib', |
| 587 'ProgramDatabaseFile': '$(OutDir)\\nacl64_exe.pdb', | |
| 588 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS | 586 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS |
| 589 }, | 587 }, |
| 590 }, | 588 }, |
| 591 'configurations': { | 589 'configurations': { |
| 592 'Common_Base': { | 590 'Common_Base': { |
| 593 'msvs_target_platform': 'x64', | 591 'msvs_target_platform': 'x64', |
| 594 }, | 592 }, |
| 595 }, | 593 }, |
| 596 }, | 594 }, |
| 597 ], | 595 ], |
| 598 }, { # else (disable_nacl==1) | 596 }, { # else (disable_nacl==1) |
| 599 'targets': [ | 597 'targets': [ |
| 600 { | 598 { |
| 601 'target_name': 'chrome_nacl_win64', | 599 'target_name': 'chrome_nacl_win64', |
| 602 'type': 'none', | 600 'type': 'none', |
| 603 'sources': [], | 601 'sources': [], |
| 604 }, | 602 }, |
| 605 ], | 603 ], |
| 606 }], | 604 }], |
| 607 ], | 605 ], |
| 608 }], | 606 }], |
| 609 ], | 607 ], |
| 610 } | 608 } |
| OLD | NEW |