| 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 5252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5263 # different attributes | 5263 # different attributes |
| 5264 'AdditionalOptions': ['/ignore:4254', '/ignore:4078'], | 5264 'AdditionalOptions': ['/ignore:4254', '/ignore:4078'], |
| 5265 }, | 5265 }, |
| 5266 }, | 5266 }, |
| 5267 'msvs_system_include_dirs': [ | 5267 'msvs_system_include_dirs': [ |
| 5268 '<(windows_driver_kit_path)/inc/atl71', | 5268 '<(windows_driver_kit_path)/inc/atl71', |
| 5269 '<(windows_driver_kit_path)/inc/mfc42', | 5269 '<(windows_driver_kit_path)/inc/mfc42', |
| 5270 ], | 5270 ], |
| 5271 }], | 5271 }], |
| 5272 ], | 5272 ], |
| 5273 'msvs_system_include_dirs': [ | |
| 5274 '<(windows_sdk_path)/Include/shared', | |
| 5275 '<(windows_sdk_path)/Include/um', | |
| 5276 '<(windows_sdk_path)/Include/winrt', | |
| 5277 '$(VSInstallDir)/VC/atlmfc/include', | |
| 5278 ], | |
| 5279 'msvs_cygwin_shell': 0, | 5273 'msvs_cygwin_shell': 0, |
| 5280 'msvs_disabled_warnings': [ | 5274 'msvs_disabled_warnings': [ |
| 5281 4351, 4355, 4396, 4503, 4819, | 5275 4351, 4355, 4396, 4503, 4819, |
| 5282 # TODO(maruel): These warnings are level 4. They will be slowly | 5276 # TODO(maruel): These warnings are level 4. They will be slowly |
| 5283 # removed as code is fixed. | 5277 # removed as code is fixed. |
| 5284 4100, 4121, 4125, 4127, 4130, 4131, 4189, 4201, 4238, 4244, 4245, | 5278 4100, 4121, 4125, 4127, 4130, 4131, 4189, 4201, 4238, 4244, 4245, |
| 5285 4310, 4428, 4481, 4505, 4510, 4512, 4530, 4610, 4611, 4701, 4706, | 5279 4310, 4428, 4481, 4505, 4510, 4512, 4530, 4610, 4611, 4701, 4706, |
| 5286 ], | 5280 ], |
| 5287 'msvs_settings': { | 5281 'msvs_settings': { |
| 5288 'VCCLCompilerTool': { | 5282 'VCCLCompilerTool': { |
| (...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5654 # settings in target dicts. SYMROOT is a special case, because many other | 5648 # settings in target dicts. SYMROOT is a special case, because many other |
| 5655 # Xcode variables depend on it, including variables such as | 5649 # Xcode variables depend on it, including variables such as |
| 5656 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5650 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5657 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5651 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5658 # files to appear (when present) in the UI as actual files and not red | 5652 # files to appear (when present) in the UI as actual files and not red |
| 5659 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5653 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5660 # and therefore SYMROOT, needs to be set at the project level. | 5654 # and therefore SYMROOT, needs to be set at the project level. |
| 5661 'SYMROOT': '<(DEPTH)/xcodebuild', | 5655 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5662 }, | 5656 }, |
| 5663 } | 5657 } |
| OLD | NEW |