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 # IMPORTANT: | 5 # IMPORTANT: |
6 # Please don't directly include this file if you are building via gyp_chromium, | 6 # Please don't directly include this file if you are building via gyp_chromium, |
7 # since gyp_chromium is automatically forcing its inclusion. | 7 # since gyp_chromium is automatically forcing its inclusion. |
8 { | 8 { |
9 # Variables expected to be overriden on the GYP command line (-D) or by | 9 # Variables expected to be overriden on the GYP command line (-D) or by |
10 # ~/.gyp/include.gypi. | 10 # ~/.gyp/include.gypi. |
(...skipping 3261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3272 # The above is not sufficient (http://crbug.com/106711): it | 3272 # The above is not sufficient (http://crbug.com/106711): it |
3273 # simply eliminates an explicit "/Oy", but both /O2 and /Ox | 3273 # simply eliminates an explicit "/Oy", but both /O2 and /Ox |
3274 # perform FPO regardless, so we must explicitly disable. | 3274 # perform FPO regardless, so we must explicitly disable. |
3275 # We still want the false setting above to avoid having | 3275 # We still want the false setting above to avoid having |
3276 # "/Oy /Oy-" and warnings about overriding. | 3276 # "/Oy /Oy-" and warnings about overriding. |
3277 'AdditionalOptions': ['/Oy-'], | 3277 'AdditionalOptions': ['/Oy-'], |
3278 }], | 3278 }], |
3279 ], | 3279 ], |
3280 'AdditionalOptions': [ | 3280 'AdditionalOptions': [ |
3281 '/d2Zi+', # Improve debugging of Release builds. | 3281 '/d2Zi+', # Improve debugging of Release builds. |
| 3282 '/Zc:inline', # Remove unreferenced COMDAT (faster links). |
3282 '<@(win_release_extra_cflags)', | 3283 '<@(win_release_extra_cflags)', |
3283 ], | 3284 ], |
3284 }, | 3285 }, |
3285 'VCLinkerTool': { | 3286 'VCLinkerTool': { |
3286 # LinkIncremental is a tri-state boolean, where 0 means default | 3287 # LinkIncremental is a tri-state boolean, where 0 means default |
3287 # (i.e., inherit from parent solution), 1 means false, and | 3288 # (i.e., inherit from parent solution), 1 means false, and |
3288 # 2 means true. | 3289 # 2 means true. |
3289 'LinkIncremental': '1', | 3290 'LinkIncremental': '1', |
3290 # This corresponds to the /PROFILE flag which ensures the PDB | 3291 # This corresponds to the /PROFILE flag which ensures the PDB |
3291 # file contains FIXUP information (growing the PDB file by about | 3292 # file contains FIXUP information (growing the PDB file by about |
(...skipping 1897 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5189 }, | 5190 }, |
5190 }, | 5191 }, |
5191 }, | 5192 }, |
5192 # https://code.google.com/p/chromium/issues/detail?id=372451#c20 | 5193 # https://code.google.com/p/chromium/issues/detail?id=372451#c20 |
5193 # Warning 4702 ("Unreachable code") should be re-enabled once | 5194 # Warning 4702 ("Unreachable code") should be re-enabled once |
5194 # Express users are updated to VS2013 Update 2. | 5195 # Express users are updated to VS2013 Update 2. |
5195 'msvs_disabled_warnings': [ | 5196 'msvs_disabled_warnings': [ |
5196 4702 | 5197 4702 |
5197 ], | 5198 ], |
5198 'msvs_settings': { | 5199 'msvs_settings': { |
| 5200 'VCCLCompilerTool': { |
| 5201 'AdditionalOptions!': [ |
| 5202 '/Zc:inline', # Not supported on non-updated Express. |
| 5203 ], |
| 5204 }, |
5199 'VCLinkerTool': { | 5205 'VCLinkerTool': { |
5200 # Explicitly required when using the ATL with express | 5206 # Explicitly required when using the ATL with express |
5201 'AdditionalDependencies': ['atlthunk.lib'], | 5207 'AdditionalDependencies': ['atlthunk.lib'], |
5202 | 5208 |
5203 # ATL 8.0 included in WDK 7.1 makes the linker to generate | 5209 # ATL 8.0 included in WDK 7.1 makes the linker to generate |
5204 # almost eight hundred LNK4254 and LNK4078 warnings: | 5210 # almost eight hundred LNK4254 and LNK4078 warnings: |
5205 # - warning LNK4254: section 'ATL' (50000040) merged into | 5211 # - warning LNK4254: section 'ATL' (50000040) merged into |
5206 # '.rdata' (40000040) with different attributes | 5212 # '.rdata' (40000040) with different attributes |
5207 # - warning LNK4078: multiple 'ATL' sections found with | 5213 # - warning LNK4078: multiple 'ATL' sections found with |
5208 # different attributes | 5214 # different attributes |
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5658 # settings in target dicts. SYMROOT is a special case, because many other | 5664 # settings in target dicts. SYMROOT is a special case, because many other |
5659 # Xcode variables depend on it, including variables such as | 5665 # Xcode variables depend on it, including variables such as |
5660 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5666 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
5661 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5667 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
5662 # files to appear (when present) in the UI as actual files and not red | 5668 # files to appear (when present) in the UI as actual files and not red |
5663 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5669 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
5664 # and therefore SYMROOT, needs to be set at the project level. | 5670 # and therefore SYMROOT, needs to be set at the project level. |
5665 'SYMROOT': '<(DEPTH)/xcodebuild', | 5671 'SYMROOT': '<(DEPTH)/xcodebuild', |
5666 }, | 5672 }, |
5667 } | 5673 } |
OLD | NEW |