| 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 # 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 1475 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1486 ['win_release_InlineFunctionExpansion!=""', { | 1486 ['win_release_InlineFunctionExpansion!=""', { |
| 1487 'InlineFunctionExpansion': | 1487 'InlineFunctionExpansion': |
| 1488 '<(win_release_InlineFunctionExpansion)', | 1488 '<(win_release_InlineFunctionExpansion)', |
| 1489 }], | 1489 }], |
| 1490 | 1490 |
| 1491 ['win_release_OmitFramePointers==1', { | 1491 ['win_release_OmitFramePointers==1', { |
| 1492 'OmitFramePointers': 'true', | 1492 'OmitFramePointers': 'true', |
| 1493 }], | 1493 }], |
| 1494 ['win_release_OmitFramePointers==0', { | 1494 ['win_release_OmitFramePointers==0', { |
| 1495 'OmitFramePointers': 'false', | 1495 'OmitFramePointers': 'false', |
| 1496 # The above is not sufficient (http://crbug.com/106711): it | |
| 1497 # simply eliminates an explicit "/Oy", but both /O2 and /Ox | |
| 1498 # perform FPO regardless, so we must explicitly disable. | |
| 1499 # We still want the false setting above to avoid having | |
| 1500 # "/Oy /Oy-" and warnings about overriding. | |
| 1501 'AdditionalOptions': ['/Oy-'], | |
| 1502 }], | 1496 }], |
| 1503 ], | 1497 ], |
| 1504 }, | 1498 }, |
| 1505 'VCLinkerTool': { | 1499 'VCLinkerTool': { |
| 1506 # LinkIncremental is a tri-state boolean, where 0 means default | 1500 # LinkIncremental is a tri-state boolean, where 0 means default |
| 1507 # (i.e., inherit from parent solution), 1 means false, and | 1501 # (i.e., inherit from parent solution), 1 means false, and |
| 1508 # 2 means true. | 1502 # 2 means true. |
| 1509 'LinkIncremental': '1', | 1503 'LinkIncremental': '1', |
| 1510 # This corresponds to the /PROFILE flag which ensures the PDB | 1504 # This corresponds to the /PROFILE flag which ensures the PDB |
| 1511 # file contains FIXUP information (growing the PDB file by about | 1505 # file contains FIXUP information (growing the PDB file by about |
| (...skipping 1153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2665 # settings in target dicts. SYMROOT is a special case, because many other | 2659 # settings in target dicts. SYMROOT is a special case, because many other |
| 2666 # Xcode variables depend on it, including variables such as | 2660 # Xcode variables depend on it, including variables such as |
| 2667 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 2661 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 2668 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 2662 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 2669 # files to appear (when present) in the UI as actual files and not red | 2663 # files to appear (when present) in the UI as actual files and not red |
| 2670 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 2664 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 2671 # and therefore SYMROOT, needs to be set at the project level. | 2665 # and therefore SYMROOT, needs to be set at the project level. |
| 2672 'SYMROOT': '<(DEPTH)/xcodebuild', | 2666 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 2673 }, | 2667 }, |
| 2674 } | 2668 } |
| OLD | NEW |