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 3371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3382 # simply eliminates an explicit "/Oy", but both /O2 and /Ox | 3382 # simply eliminates an explicit "/Oy", but both /O2 and /Ox |
3383 # perform FPO regardless, so we must explicitly disable. | 3383 # perform FPO regardless, so we must explicitly disable. |
3384 # We still want the false setting above to avoid having | 3384 # We still want the false setting above to avoid having |
3385 # "/Oy /Oy-" and warnings about overriding. | 3385 # "/Oy /Oy-" and warnings about overriding. |
3386 'AdditionalOptions': ['/Oy-'], | 3386 'AdditionalOptions': ['/Oy-'], |
3387 }], | 3387 }], |
3388 ], | 3388 ], |
3389 'AdditionalOptions': [ | 3389 'AdditionalOptions': [ |
3390 '/d2Zi+', # Improve debugging of Release builds. | 3390 '/d2Zi+', # Improve debugging of Release builds. |
3391 '/Zc:inline', # Remove unreferenced COMDAT (faster links). | 3391 '/Zc:inline', # Remove unreferenced COMDAT (faster links). |
| 3392 '/Gw', # Put data in separate COMDATs. |
3392 '<@(win_release_extra_cflags)', | 3393 '<@(win_release_extra_cflags)', |
3393 ], | 3394 ], |
3394 }, | 3395 }, |
3395 'VCLinkerTool': { | 3396 'VCLinkerTool': { |
3396 # LinkIncremental is a tri-state boolean, where 0 means default | 3397 # LinkIncremental is a tri-state boolean, where 0 means default |
3397 # (i.e., inherit from parent solution), 1 means false, and | 3398 # (i.e., inherit from parent solution), 1 means false, and |
3398 # 2 means true. | 3399 # 2 means true. |
3399 'LinkIncremental': '1', | 3400 'LinkIncremental': '1', |
3400 # This corresponds to the /PROFILE flag which ensures the PDB | 3401 # This corresponds to the /PROFILE flag which ensures the PDB |
3401 # file contains FIXUP information (growing the PDB file by about | 3402 # file contains FIXUP information (growing the PDB file by about |
(...skipping 2440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5842 # settings in target dicts. SYMROOT is a special case, because many other | 5843 # settings in target dicts. SYMROOT is a special case, because many other |
5843 # Xcode variables depend on it, including variables such as | 5844 # Xcode variables depend on it, including variables such as |
5844 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5845 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
5845 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5846 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
5846 # files to appear (when present) in the UI as actual files and not red | 5847 # files to appear (when present) in the UI as actual files and not red |
5847 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5848 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
5848 # and therefore SYMROOT, needs to be set at the project level. | 5849 # and therefore SYMROOT, needs to be set at the project level. |
5849 'SYMROOT': '<(DEPTH)/xcodebuild', | 5850 'SYMROOT': '<(DEPTH)/xcodebuild', |
5850 }, | 5851 }, |
5851 } | 5852 } |
OLD | NEW |