| 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 5693 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5704 4996, # 'X': was declared deprecated (for GetVersionEx). | 5704 4996, # 'X': was declared deprecated (for GetVersionEx). |
| 5705 | 5705 |
| 5706 # These are variable shadowing warnings that are new in VS2015. We | 5706 # These are variable shadowing warnings that are new in VS2015. We |
| 5707 # should work through these at some point -- they may be removed from | 5707 # should work through these at some point -- they may be removed from |
| 5708 # the RTM release in the /W4 set. | 5708 # the RTM release in the /W4 set. |
| 5709 4456, 4457, 4458, 4459, | 5709 4456, 4457, 4458, 4459, |
| 5710 | 5710 |
| 5711 # TODO(brucedawson): http://crbug.com/554200 4312 is a VS | 5711 # TODO(brucedawson): http://crbug.com/554200 4312 is a VS |
| 5712 # 2015 64-bit warning for integer to larger pointer | 5712 # 2015 64-bit warning for integer to larger pointer |
| 5713 4312, | 5713 4312, |
| 5714 |
| 5715 # TODO(brucedawson): http://crbug.com/593448 4334 is a 'suspicious |
| 5716 # shift' warning and 4595 is an 'illegal inline operator new' warning |
| 5717 # Both are new in VS 2015 Update 2 and can safely be deferred for now. |
| 5718 4334, 4595, |
| 5714 ], | 5719 ], |
| 5715 'msvs_settings': { | 5720 'msvs_settings': { |
| 5716 'VCCLCompilerTool': { | 5721 'VCCLCompilerTool': { |
| 5717 'AdditionalOptions': ['/MP'], | 5722 'AdditionalOptions': ['/MP'], |
| 5718 'MinimalRebuild': 'false', | 5723 'MinimalRebuild': 'false', |
| 5719 'BufferSecurityCheck': 'true', | 5724 'BufferSecurityCheck': 'true', |
| 5720 'EnableFunctionLevelLinking': 'true', | 5725 'EnableFunctionLevelLinking': 'true', |
| 5721 'RuntimeTypeInfo': 'false', | 5726 'RuntimeTypeInfo': 'false', |
| 5722 'WarningLevel': '4', | 5727 'WarningLevel': '4', |
| 5723 'WarnAsError': 'true', | 5728 'WarnAsError': 'true', |
| (...skipping 625 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6349 # settings in target dicts. SYMROOT is a special case, because many other | 6354 # settings in target dicts. SYMROOT is a special case, because many other |
| 6350 # Xcode variables depend on it, including variables such as | 6355 # Xcode variables depend on it, including variables such as |
| 6351 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6356 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 6352 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6357 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 6353 # files to appear (when present) in the UI as actual files and not red | 6358 # files to appear (when present) in the UI as actual files and not red |
| 6354 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6359 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 6355 # and therefore SYMROOT, needs to be set at the project level. | 6360 # and therefore SYMROOT, needs to be set at the project level. |
| 6356 'SYMROOT': '<(DEPTH)/xcodebuild', | 6361 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 6357 }, | 6362 }, |
| 6358 } | 6363 } |
| OLD | NEW |