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