| 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 5699 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5710 | 5710 |
| 5711 # These are variable shadowing warnings that are new in VS2015. We | 5711 # These are variable shadowing warnings that are new in VS2015. We |
| 5712 # should work through these at some point -- they may be removed from | 5712 # should work through these at some point -- they may be removed from |
| 5713 # the RTM release in the /W4 set. | 5713 # the RTM release in the /W4 set. |
| 5714 4456, 4457, 4458, 4459, | 5714 4456, 4457, 4458, 4459, |
| 5715 | 5715 |
| 5716 # TODO(brucedawson): http://crbug.com/554200 4312 is a VS | 5716 # TODO(brucedawson): http://crbug.com/554200 4312 is a VS |
| 5717 # 2015 64-bit warning for integer to larger pointer | 5717 # 2015 64-bit warning for integer to larger pointer |
| 5718 4312, | 5718 4312, |
| 5719 | 5719 |
| 5720 # TODO(brucedawson): http://crbug.com/593448 4334 is a 'suspicious | 5720 # TODO(brucedawson): http://crbug.com/593448 - C4595 is an 'illegal |
| 5721 # shift' warning and 4595 is an 'illegal inline operator new' warning | 5721 # inline operator new' warning that is new in VS 2015 Update 2. |
| 5722 # Both are new in VS 2015 Update 2 and can safely be deferred for now. | 5722 # This is equivalent to clang's no-inline-new-delete warning. |
| 5723 4334, 4595, | 5723 # See http://bugs.icu-project.org/trac/ticket/11122 |
| 5724 4595, |
| 5724 ], | 5725 ], |
| 5725 'msvs_settings': { | 5726 'msvs_settings': { |
| 5726 'VCCLCompilerTool': { | 5727 'VCCLCompilerTool': { |
| 5727 'AdditionalOptions': ['/MP'], | 5728 'AdditionalOptions': ['/MP'], |
| 5728 'MinimalRebuild': 'false', | 5729 'MinimalRebuild': 'false', |
| 5729 'EnableFunctionLevelLinking': 'true', | 5730 'EnableFunctionLevelLinking': 'true', |
| 5730 'RuntimeTypeInfo': 'false', | 5731 'RuntimeTypeInfo': 'false', |
| 5731 'WarningLevel': '4', | 5732 'WarningLevel': '4', |
| 5732 'WarnAsError': 'true', | 5733 'WarnAsError': 'true', |
| 5733 'DebugInformationFormat': '3', | 5734 'DebugInformationFormat': '3', |
| (...skipping 629 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6363 # settings in target dicts. SYMROOT is a special case, because many other | 6364 # settings in target dicts. SYMROOT is a special case, because many other |
| 6364 # Xcode variables depend on it, including variables such as | 6365 # Xcode variables depend on it, including variables such as |
| 6365 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6366 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 6366 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6367 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 6367 # files to appear (when present) in the UI as actual files and not red | 6368 # files to appear (when present) in the UI as actual files and not red |
| 6368 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6369 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 6369 # and therefore SYMROOT, needs to be set at the project level. | 6370 # and therefore SYMROOT, needs to be set at the project level. |
| 6370 'SYMROOT': '<(DEPTH)/xcodebuild', | 6371 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 6371 }, | 6372 }, |
| 6372 } | 6373 } |
| OLD | NEW |