Chromium Code Reviews| 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 2658 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2669 }], | 2669 }], |
| 2670 ['win_release_OmitFramePointers==0', { | 2670 ['win_release_OmitFramePointers==0', { |
| 2671 'OmitFramePointers': 'false', | 2671 'OmitFramePointers': 'false', |
| 2672 # The above is not sufficient (http://crbug.com/106711): it | 2672 # The above is not sufficient (http://crbug.com/106711): it |
| 2673 # simply eliminates an explicit "/Oy", but both /O2 and /Ox | 2673 # simply eliminates an explicit "/Oy", but both /O2 and /Ox |
| 2674 # perform FPO regardless, so we must explicitly disable. | 2674 # perform FPO regardless, so we must explicitly disable. |
| 2675 # We still want the false setting above to avoid having | 2675 # We still want the false setting above to avoid having |
| 2676 # "/Oy /Oy-" and warnings about overriding. | 2676 # "/Oy /Oy-" and warnings about overriding. |
| 2677 'AdditionalOptions': ['/Oy-'], | 2677 'AdditionalOptions': ['/Oy-'], |
| 2678 }], | 2678 }], |
| 2679 ['win_debug_disable_iterator_debugging!=1', { | |
|
scottmg
2013/09/18 19:03:49
is this used elsewhere? it really shouldn't be cal
Will Harris
2013/09/19 09:40:57
added a new win_release_disable_iterator_debugging
| |
| 2680 # VS2010 changed default _ITERATOR_DEBUG_LEVEL to 0 | |
| 2681 # on Release builds so we change it back to 1 to restore these | |
| 2682 # checks, except if explicitly disabled | |
| 2683 # See http://crbug.com/289691 | |
| 2684 'PreprocessorDefinitions': ['_ITERATOR_DEBUG_LEVEL=1'], | |
| 2685 }], | |
| 2679 ], | 2686 ], |
| 2680 'AdditionalOptions': [ '<@(win_release_extra_cflags)', ], | 2687 'AdditionalOptions': [ '<@(win_release_extra_cflags)', ], |
| 2681 }, | 2688 }, |
| 2682 'VCLinkerTool': { | 2689 'VCLinkerTool': { |
| 2683 # LinkIncremental is a tri-state boolean, where 0 means default | 2690 # LinkIncremental is a tri-state boolean, where 0 means default |
| 2684 # (i.e., inherit from parent solution), 1 means false, and | 2691 # (i.e., inherit from parent solution), 1 means false, and |
| 2685 # 2 means true. | 2692 # 2 means true. |
| 2686 'LinkIncremental': '1', | 2693 'LinkIncremental': '1', |
| 2687 # This corresponds to the /PROFILE flag which ensures the PDB | 2694 # This corresponds to the /PROFILE flag which ensures the PDB |
| 2688 # file contains FIXUP information (growing the PDB file by about | 2695 # file contains FIXUP information (growing the PDB file by about |
| (...skipping 2056 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4745 # settings in target dicts. SYMROOT is a special case, because many other | 4752 # settings in target dicts. SYMROOT is a special case, because many other |
| 4746 # Xcode variables depend on it, including variables such as | 4753 # Xcode variables depend on it, including variables such as |
| 4747 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4754 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 4748 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4755 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 4749 # files to appear (when present) in the UI as actual files and not red | 4756 # files to appear (when present) in the UI as actual files and not red |
| 4750 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4757 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 4751 # and therefore SYMROOT, needs to be set at the project level. | 4758 # and therefore SYMROOT, needs to be set at the project level. |
| 4752 'SYMROOT': '<(DEPTH)/xcodebuild', | 4759 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 4753 }, | 4760 }, |
| 4754 } | 4761 } |
| OLD | NEW |