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 5612 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5623 # PGO builds is likely very small. | 5623 # PGO builds is likely very small. |
5624 'msvs_disabled_warnings': [ | 5624 'msvs_disabled_warnings': [ |
5625 4702 | 5625 4702 |
5626 ], | 5626 ], |
5627 'msvs_settings': { | 5627 'msvs_settings': { |
5628 'VCCLCompilerTool': { | 5628 'VCCLCompilerTool': { |
5629 # 2, optimizeMaxSpeed, Maximize Speed (/O2) | 5629 # 2, optimizeMaxSpeed, Maximize Speed (/O2) |
5630 'Optimization': '2', | 5630 'Optimization': '2', |
5631 # 1, favorSpeed - Favor fast code (/Ot) | 5631 # 1, favorSpeed - Favor fast code (/Ot) |
5632 'FavorSizeOrSpeed': '1', | 5632 'FavorSizeOrSpeed': '1', |
5633 # This implies link time code generation. | |
5634 'WholeProgramOptimization': 'true', | |
5635 }, | 5633 }, |
5636 }, | 5634 }, |
| 5635 # TODO(thakis): Remove clang==0 here, https://crbug.com/598772 |
| 5636 'conditions': [ |
| 5637 ['clang==0', { |
| 5638 'msvs_settings': { |
| 5639 'VCCLCompilerTool': { |
| 5640 # This implies link time code generation. |
| 5641 'WholeProgramOptimization': 'true', |
| 5642 }, |
| 5643 }, |
| 5644 }], |
| 5645 ], |
5637 }], | 5646 }], |
5638 ], | 5647 ], |
5639 }], | 5648 }], |
5640 ['msvs_xtree_patched!=1', { | 5649 ['msvs_xtree_patched!=1', { |
5641 # If xtree hasn't been patched, then we disable C4702. Otherwise, | 5650 # If xtree hasn't been patched, then we disable C4702. Otherwise, |
5642 # it's enabled. This will generally only be true for system-level | 5651 # it's enabled. This will generally only be true for system-level |
5643 # installed Express users. | 5652 # installed Express users. |
5644 'msvs_disabled_warnings': [ | 5653 'msvs_disabled_warnings': [ |
5645 4702, # unreachable code | 5654 4702, # unreachable code |
5646 ], | 5655 ], |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5734 | 5743 |
5735 # TODO(brucedawson): http://crbug.com/593448 4334 is a 'suspicious | 5744 # TODO(brucedawson): http://crbug.com/593448 4334 is a 'suspicious |
5736 # shift' warning and 4595 is an 'illegal inline operator new' warning | 5745 # shift' warning and 4595 is an 'illegal inline operator new' warning |
5737 # Both are new in VS 2015 Update 2 and can safely be deferred for now. | 5746 # Both are new in VS 2015 Update 2 and can safely be deferred for now. |
5738 4334, 4595, | 5747 4334, 4595, |
5739 ], | 5748 ], |
5740 'msvs_settings': { | 5749 'msvs_settings': { |
5741 'VCCLCompilerTool': { | 5750 'VCCLCompilerTool': { |
5742 'AdditionalOptions': ['/MP'], | 5751 'AdditionalOptions': ['/MP'], |
5743 'MinimalRebuild': 'false', | 5752 'MinimalRebuild': 'false', |
5744 'BufferSecurityCheck': 'true', | |
5745 'EnableFunctionLevelLinking': 'true', | 5753 'EnableFunctionLevelLinking': 'true', |
5746 'RuntimeTypeInfo': 'false', | 5754 'RuntimeTypeInfo': 'false', |
5747 'WarningLevel': '4', | 5755 'WarningLevel': '4', |
5748 'WarnAsError': 'true', | 5756 'WarnAsError': 'true', |
5749 'DebugInformationFormat': '3', | 5757 'DebugInformationFormat': '3', |
5750 # ExceptionHandling must match _HAS_EXCEPTIONS above. | 5758 # ExceptionHandling must match _HAS_EXCEPTIONS above. |
5751 'ExceptionHandling': '0', | 5759 'ExceptionHandling': '0', |
5752 }, | 5760 }, |
5753 'VCLibrarianTool': { | 5761 'VCLibrarianTool': { |
5754 'AdditionalOptions': ['/ignore:4221'], | 5762 'AdditionalOptions': ['/ignore:4221'], |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5807 }], | 5815 }], |
5808 ['_type=="executable" and ">(win_exe_compatibility_manifest)"!=""',
{ | 5816 ['_type=="executable" and ">(win_exe_compatibility_manifest)"!=""',
{ |
5809 'VCManifestTool': { | 5817 'VCManifestTool': { |
5810 'AdditionalManifestFiles': [ | 5818 'AdditionalManifestFiles': [ |
5811 '>(win_exe_compatibility_manifest)', | 5819 '>(win_exe_compatibility_manifest)', |
5812 ], | 5820 ], |
5813 }, | 5821 }, |
5814 }], | 5822 }], |
5815 ], | 5823 ], |
5816 'conditions': [ | 5824 'conditions': [ |
| 5825 ['clang==0', { |
| 5826 'VCCLCompilerTool': { |
| 5827 # TODO(thakis): Enable this with clang too, |
| 5828 # https://crbug.com/598767 |
| 5829 'BufferSecurityCheck': 'true', |
| 5830 }, |
| 5831 }], |
| 5832 |
5817 # Building with Clang on Windows is a work in progress and very | 5833 # Building with Clang on Windows is a work in progress and very |
5818 # experimental. See crbug.com/82385. | 5834 # experimental. See crbug.com/82385. |
5819 # Keep this in sync with the similar blocks in build/config/compiler
/BUILD.gn | 5835 # Keep this in sync with the similar blocks in build/config/compiler
/BUILD.gn |
5820 ['clang==1', { | 5836 ['clang==1', { |
5821 'VCCLCompilerTool': { | 5837 'VCCLCompilerTool': { |
5822 'AdditionalOptions': [ | 5838 'AdditionalOptions': [ |
5823 # Don't warn about unused function parameters. | 5839 # Don't warn about unused function parameters. |
5824 # (This is also used on other platforms.) | 5840 # (This is also used on other platforms.) |
5825 '-Wno-unused-parameter', | 5841 '-Wno-unused-parameter', |
5826 # Don't warn about the "struct foo f = {0};" initialization | 5842 # Don't warn about the "struct foo f = {0};" initialization |
5827 # pattern. | 5843 # pattern. |
5828 '-Wno-missing-field-initializers', | 5844 '-Wno-missing-field-initializers', |
5829 | 5845 |
5830 # Many files use intrinsics without including this header. | 5846 # Many files use intrinsics without including this header. |
5831 # TODO(hans): Fix those files, or move this to sub-GYPs. | 5847 # TODO(hans): Fix those files, or move this to sub-GYPs. |
5832 '/FIIntrin.h', | 5848 '/FIIntrin.h', |
5833 | 5849 |
5834 # TODO(hans): Make this list shorter eventually, http://crbug.
com/504657 | 5850 # TODO(hans): Make this list shorter eventually, http://crbug.
com/504657 |
5835 '-Qunused-arguments', # http://crbug.com/504658 | |
5836 '-Wno-microsoft-enum-value', # http://crbug.com/505296 | 5851 '-Wno-microsoft-enum-value', # http://crbug.com/505296 |
5837 '-Wno-unknown-pragmas', # http://crbug.com/505314 | 5852 '-Wno-unknown-pragmas', # http://crbug.com/505314 |
5838 '-Wno-microsoft-cast', # http://crbug.com/550065 | 5853 '-Wno-microsoft-cast', # http://crbug.com/550065 |
5839 ], | 5854 ], |
5840 }, | 5855 }, |
5841 }], | 5856 }], |
5842 ['clang==1 and clang_use_chrome_plugins==1', { | 5857 ['clang==1 and clang_use_chrome_plugins==1', { |
5843 'VCCLCompilerTool': { | 5858 'VCCLCompilerTool': { |
5844 'AdditionalOptions': [ | 5859 'AdditionalOptions': [ |
5845 '<@(clang_chrome_plugins_flags)', | 5860 '<@(clang_chrome_plugins_flags)', |
(...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6376 # settings in target dicts. SYMROOT is a special case, because many other | 6391 # settings in target dicts. SYMROOT is a special case, because many other |
6377 # Xcode variables depend on it, including variables such as | 6392 # Xcode variables depend on it, including variables such as |
6378 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6393 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
6379 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6394 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
6380 # files to appear (when present) in the UI as actual files and not red | 6395 # files to appear (when present) in the UI as actual files and not red |
6381 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6396 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
6382 # and therefore SYMROOT, needs to be set at the project level. | 6397 # and therefore SYMROOT, needs to be set at the project level. |
6383 'SYMROOT': '<(DEPTH)/xcodebuild', | 6398 'SYMROOT': '<(DEPTH)/xcodebuild', |
6384 }, | 6399 }, |
6385 } | 6400 } |
OLD | NEW |