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 3319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3330 'Profile': 'false', | 3330 'Profile': 'false', |
3331 'AdditionalOptions': [ | 3331 'AdditionalOptions': [ |
3332 # Tell VS 2015+ to create a PDB that references debug | 3332 # Tell VS 2015+ to create a PDB that references debug |
3333 # information in .obj and .lib files instead of copying | 3333 # information in .obj and .lib files instead of copying |
3334 # it all. | 3334 # it all. |
3335 '/DEBUG:FASTLINK', | 3335 '/DEBUG:FASTLINK', |
3336 ], | 3336 ], |
3337 }, | 3337 }, |
3338 }, | 3338 }, |
3339 }], | 3339 }], |
| 3340 ['OS=="win" and MSVS_VERSION == "2015"', { |
| 3341 'msvs_settings': { |
| 3342 'VCCLCompilerTool': { |
| 3343 'AdditionalOptions': [ |
| 3344 # Work around crbug.com/526851, bug in VS 2015 RTM compiler. |
| 3345 '/Zc:sizedDealloc-', |
| 3346 ], |
| 3347 }, |
| 3348 }, |
| 3349 }], |
3340 ], | 3350 ], |
3341 }, | 3351 }, |
3342 'x86_Base': { | 3352 'x86_Base': { |
3343 'abstract': 1, | 3353 'abstract': 1, |
3344 'msvs_settings': { | 3354 'msvs_settings': { |
3345 'VCLinkerTool': { | 3355 'VCLinkerTool': { |
3346 'MinimumRequiredVersion': '5.01', # XP. | 3356 'MinimumRequiredVersion': '5.01', # XP. |
3347 'TargetMachine': '1', | 3357 'TargetMachine': '1', |
3348 }, | 3358 }, |
3349 'VCLibrarianTool': { | 3359 'VCLibrarianTool': { |
(...skipping 2969 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6319 # settings in target dicts. SYMROOT is a special case, because many other | 6329 # settings in target dicts. SYMROOT is a special case, because many other |
6320 # Xcode variables depend on it, including variables such as | 6330 # Xcode variables depend on it, including variables such as |
6321 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6331 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
6322 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6332 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
6323 # files to appear (when present) in the UI as actual files and not red | 6333 # files to appear (when present) in the UI as actual files and not red |
6324 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6334 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
6325 # and therefore SYMROOT, needs to be set at the project level. | 6335 # and therefore SYMROOT, needs to be set at the project level. |
6326 'SYMROOT': '<(DEPTH)/xcodebuild', | 6336 'SYMROOT': '<(DEPTH)/xcodebuild', |
6327 }, | 6337 }, |
6328 } | 6338 } |
OLD | NEW |