| OLD | NEW |
| 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 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 | 8 |
| 9 'variables': { | 9 'variables': { |
| 10 'version_py_path': '../tools/build/version.py', | 10 'version_py_path': '../tools/build/version.py', |
| (...skipping 883 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 894 # Crash Reporting | 894 # Crash Reporting |
| 895 'crash_reporting/crash_reporting.gyp:crash_report', | 895 'crash_reporting/crash_reporting.gyp:crash_report', |
| 896 ], | 896 ], |
| 897 'link_settings': { | 897 'link_settings': { |
| 898 'libraries': [ | 898 'libraries': [ |
| 899 '-lshdocvw.lib', | 899 '-lshdocvw.lib', |
| 900 ], | 900 ], |
| 901 }, | 901 }, |
| 902 'msvs_settings': { | 902 'msvs_settings': { |
| 903 'VCLinkerTool': { | 903 'VCLinkerTool': { |
| 904 'OutputFile': | |
| 905 '$(OutDir)\\servers\\$(ProjectName).dll', | |
| 906 'DelayLoadDLLs': [], | 904 'DelayLoadDLLs': [], |
| 907 'BaseAddress': '0x33000000', | 905 'BaseAddress': '0x33000000', |
| 908 # Set /SUBSYSTEM:WINDOWS (for consistency). | 906 # Set /SUBSYSTEM:WINDOWS (for consistency). |
| 909 'SubSystem': '2', | 907 'SubSystem': '2', |
| 910 }, | 908 }, |
| 911 'VCManifestTool': { | 909 'VCManifestTool': { |
| 912 'AdditionalManifestFiles': | 910 'AdditionalManifestFiles': |
| 913 '$(ProjectDir)\\resources\\npchrome_frame.dll.manifest', | 911 '$(ProjectDir)\\resources\\npchrome_frame.dll.manifest', |
| 914 }, | 912 }, |
| 915 }, | 913 }, |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1048 # Use outputs of this action as inputs for the main target build. | 1046 # Use outputs of this action as inputs for the main target build. |
| 1049 # Seems as a misnomer but makes this happy on Linux (scons). | 1047 # Seems as a misnomer but makes this happy on Linux (scons). |
| 1050 'process_outputs_as_sources': 1, | 1048 'process_outputs_as_sources': 1, |
| 1051 }, | 1049 }, |
| 1052 ], | 1050 ], |
| 1053 }, | 1051 }, |
| 1054 ], | 1052 ], |
| 1055 }, ], # 'coverage!=0' | 1053 }, ], # 'coverage!=0' |
| 1056 ], # 'conditions' | 1054 ], # 'conditions' |
| 1057 } | 1055 } |
| OLD | NEW |