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 5619 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5630 # removed as code is fixed. | 5630 # removed as code is fixed. |
5631 4100, # Unreferenced formal parameter | 5631 4100, # Unreferenced formal parameter |
5632 4121, # Alignment of a member was sensitive to packing | 5632 4121, # Alignment of a member was sensitive to packing |
5633 4244, # Conversion from 'type1' to 'type2', possible loss of data | 5633 4244, # Conversion from 'type1' to 'type2', possible loss of data |
5634 4481, # Nonstandard extension used: override specifier 'keyword' | 5634 4481, # Nonstandard extension used: override specifier 'keyword' |
5635 4505, # Unreferenced local function has been removed | 5635 4505, # Unreferenced local function has been removed |
5636 4510, # Default constructor could not be generated | 5636 4510, # Default constructor could not be generated |
5637 4512, # Assignment operator could not be generated | 5637 4512, # Assignment operator could not be generated |
5638 4610, # Object can never be instantiated | 5638 4610, # Object can never be instantiated |
5639 4838, # Narrowing conversion. Doesn't seem to be very useful. | 5639 4838, # Narrowing conversion. Doesn't seem to be very useful. |
| 5640 4995, # 'X': name was marked as #pragma deprecated |
5640 4996, # 'X': was declared deprecated (for GetVersionEx). | 5641 4996, # 'X': was declared deprecated (for GetVersionEx). |
5641 | 5642 |
5642 # These are variable shadowing warnings that are new in VS2015. We | 5643 # These are variable shadowing warnings that are new in VS2015. We |
5643 # should work through these at some point -- they may be removed from | 5644 # should work through these at some point -- they may be removed from |
5644 # the RTM release in the /W4 set. | 5645 # the RTM release in the /W4 set. |
5645 4456, 4457, 4458, 4459, | 5646 4456, 4457, 4458, 4459, |
5646 ], | 5647 ], |
5647 'msvs_settings': { | 5648 'msvs_settings': { |
5648 'VCCLCompilerTool': { | 5649 'VCCLCompilerTool': { |
5649 'AdditionalOptions': ['/MP'], | 5650 'AdditionalOptions': ['/MP'], |
(...skipping 555 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6205 # settings in target dicts. SYMROOT is a special case, because many other | 6206 # settings in target dicts. SYMROOT is a special case, because many other |
6206 # Xcode variables depend on it, including variables such as | 6207 # Xcode variables depend on it, including variables such as |
6207 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6208 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
6208 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6209 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
6209 # files to appear (when present) in the UI as actual files and not red | 6210 # files to appear (when present) in the UI as actual files and not red |
6210 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6211 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
6211 # and therefore SYMROOT, needs to be set at the project level. | 6212 # and therefore SYMROOT, needs to be set at the project level. |
6212 'SYMROOT': '<(DEPTH)/xcodebuild', | 6213 'SYMROOT': '<(DEPTH)/xcodebuild', |
6213 }, | 6214 }, |
6214 } | 6215 } |
OLD | NEW |