| 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 5684 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5695 # TODO(brucedawson): http://crbug.com/593448 - C4595 is an 'illegal | 5695 # TODO(brucedawson): http://crbug.com/593448 - C4595 is an 'illegal |
| 5696 # inline operator new' warning that is new in VS 2015 Update 2. | 5696 # inline operator new' warning that is new in VS 2015 Update 2. |
| 5697 # This is equivalent to clang's no-inline-new-delete warning. | 5697 # This is equivalent to clang's no-inline-new-delete warning. |
| 5698 # See http://bugs.icu-project.org/trac/ticket/11122 | 5698 # See http://bugs.icu-project.org/trac/ticket/11122 |
| 5699 4595, | 5699 4595, |
| 5700 ], | 5700 ], |
| 5701 'msvs_settings': { | 5701 'msvs_settings': { |
| 5702 'VCCLCompilerTool': { | 5702 'VCCLCompilerTool': { |
| 5703 'AdditionalOptions': ['/MP'], | 5703 'AdditionalOptions': ['/MP'], |
| 5704 'MinimalRebuild': 'false', | 5704 'MinimalRebuild': 'false', |
| 5705 'BufferSecurityCheck': 'true', |
| 5705 'EnableFunctionLevelLinking': 'true', | 5706 'EnableFunctionLevelLinking': 'true', |
| 5706 'RuntimeTypeInfo': 'false', | 5707 'RuntimeTypeInfo': 'false', |
| 5707 'WarningLevel': '4', | 5708 'WarningLevel': '4', |
| 5708 'WarnAsError': 'true', | 5709 'WarnAsError': 'true', |
| 5709 'DebugInformationFormat': '3', | 5710 'DebugInformationFormat': '3', |
| 5710 # ExceptionHandling must match _HAS_EXCEPTIONS above. | 5711 # ExceptionHandling must match _HAS_EXCEPTIONS above. |
| 5711 'ExceptionHandling': '0', | 5712 'ExceptionHandling': '0', |
| 5712 }, | 5713 }, |
| 5713 'VCLibrarianTool': { | 5714 'VCLibrarianTool': { |
| 5714 'AdditionalOptions': ['/ignore:4221'], | 5715 'AdditionalOptions': ['/ignore:4221'], |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5767 }], | 5768 }], |
| 5768 ['_type=="executable" and ">(win_exe_compatibility_manifest)"!=""',
{ | 5769 ['_type=="executable" and ">(win_exe_compatibility_manifest)"!=""',
{ |
| 5769 'VCManifestTool': { | 5770 'VCManifestTool': { |
| 5770 'AdditionalManifestFiles': [ | 5771 'AdditionalManifestFiles': [ |
| 5771 '>(win_exe_compatibility_manifest)', | 5772 '>(win_exe_compatibility_manifest)', |
| 5772 ], | 5773 ], |
| 5773 }, | 5774 }, |
| 5774 }], | 5775 }], |
| 5775 ], | 5776 ], |
| 5776 'conditions': [ | 5777 'conditions': [ |
| 5777 ['clang==0', { | |
| 5778 'VCCLCompilerTool': { | |
| 5779 # TODO(thakis): Enable this with clang too, | |
| 5780 # https://crbug.com/598767 | |
| 5781 'BufferSecurityCheck': 'true', | |
| 5782 }, | |
| 5783 }], | |
| 5784 | |
| 5785 # Building with Clang on Windows is a work in progress and very | 5778 # Building with Clang on Windows is a work in progress and very |
| 5786 # experimental. See crbug.com/82385. | 5779 # experimental. See crbug.com/82385. |
| 5787 # Keep this in sync with the similar blocks in build/config/compiler
/BUILD.gn | 5780 # Keep this in sync with the similar blocks in build/config/compiler
/BUILD.gn |
| 5788 ['clang==1', { | 5781 ['clang==1', { |
| 5789 'VCCLCompilerTool': { | 5782 'VCCLCompilerTool': { |
| 5790 'AdditionalOptions': [ | 5783 'AdditionalOptions': [ |
| 5791 # Don't warn about unused function parameters. | 5784 # Don't warn about unused function parameters. |
| 5792 # (This is also used on other platforms.) | 5785 # (This is also used on other platforms.) |
| 5793 '-Wno-unused-parameter', | 5786 '-Wno-unused-parameter', |
| 5794 # Don't warn about the "struct foo f = {0};" initialization | 5787 # Don't warn about the "struct foo f = {0};" initialization |
| (...skipping 527 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6322 # settings in target dicts. SYMROOT is a special case, because many other | 6315 # settings in target dicts. SYMROOT is a special case, because many other |
| 6323 # Xcode variables depend on it, including variables such as | 6316 # Xcode variables depend on it, including variables such as |
| 6324 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6317 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 6325 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6318 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 6326 # files to appear (when present) in the UI as actual files and not red | 6319 # files to appear (when present) in the UI as actual files and not red |
| 6327 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6320 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 6328 # and therefore SYMROOT, needs to be set at the project level. | 6321 # and therefore SYMROOT, needs to be set at the project level. |
| 6329 'SYMROOT': '<(DEPTH)/xcodebuild', | 6322 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 6330 }, | 6323 }, |
| 6331 } | 6324 } |
| OLD | NEW |