| 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 458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 469 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib', | 469 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib', |
| 470 'ProgramDatabaseFile': '$(OutDir)\\chrome_exe.pdb', | 470 'ProgramDatabaseFile': '$(OutDir)\\chrome_exe.pdb', |
| 471 'DelayLoadDLLs': [ | 471 'DelayLoadDLLs': [ |
| 472 'dbghelp.dll', | 472 'dbghelp.dll', |
| 473 'dwmapi.dll', | 473 'dwmapi.dll', |
| 474 'uxtheme.dll', | 474 'uxtheme.dll', |
| 475 'ole32.dll', | 475 'ole32.dll', |
| 476 'oleaut32.dll', | 476 'oleaut32.dll', |
| 477 ], | 477 ], |
| 478 # Set /SUBSYSTEM:WINDOWS for chrome.exe itself. | 478 # Set /SUBSYSTEM:WINDOWS for chrome.exe itself. |
| 479 'SubSystem': '2', | 479 'SubSystem': '1', # 2 |
| 480 }, | 480 }, |
| 481 'VCManifestTool': { | 481 'VCManifestTool': { |
| 482 'AdditionalManifestFiles': '$(ProjectDir)\\app\\chrome.exe.manifes
t', | 482 'AdditionalManifestFiles': '$(ProjectDir)\\app\\chrome.exe.manifes
t', |
| 483 }, | 483 }, |
| 484 }, | 484 }, |
| 485 'actions': [ | 485 'actions': [ |
| 486 { | 486 { |
| 487 'action_name': 'first_run', | 487 'action_name': 'first_run', |
| 488 'inputs': [ | 488 'inputs': [ |
| 489 'app/FirstRun', | 489 'app/FirstRun', |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 555 '<@(nacl_win64_defines)', | 555 '<@(nacl_win64_defines)', |
| 556 'COMPILE_CONTENT_STATICALLY', | 556 'COMPILE_CONTENT_STATICALLY', |
| 557 ], | 557 ], |
| 558 'include_dirs': [ | 558 'include_dirs': [ |
| 559 '<(SHARED_INTERMEDIATE_DIR)/chrome', | 559 '<(SHARED_INTERMEDIATE_DIR)/chrome', |
| 560 ], | 560 ], |
| 561 'msvs_settings': { | 561 'msvs_settings': { |
| 562 'VCLinkerTool': { | 562 'VCLinkerTool': { |
| 563 'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib', | 563 'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib', |
| 564 'ProgramDatabaseFile': '$(OutDir)\\nacl64_exe.pdb', | 564 'ProgramDatabaseFile': '$(OutDir)\\nacl64_exe.pdb', |
| 565 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS | 565 'SubSystem': '1', # 2 # Set /SUBSYSTEM:WINDOWS |
| 566 }, | 566 }, |
| 567 }, | 567 }, |
| 568 'configurations': { | 568 'configurations': { |
| 569 'Common_Base': { | 569 'Common_Base': { |
| 570 'msvs_target_platform': 'x64', | 570 'msvs_target_platform': 'x64', |
| 571 }, | 571 }, |
| 572 }, | 572 }, |
| 573 }, | 573 }, |
| 574 ], | 574 ], |
| 575 }], | 575 }], |
| 576 ], | 576 ], |
| 577 } | 577 } |
| OLD | NEW |