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 3124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3135 ], | 3135 ], |
3136 }], | 3136 }], |
3137 [ 'OS=="win"', { | 3137 [ 'OS=="win"', { |
3138 'defines': [ | 3138 'defines': [ |
3139 '_CRT_SECURE_NO_DEPRECATE', | 3139 '_CRT_SECURE_NO_DEPRECATE', |
3140 '_CRT_NONSTDC_NO_WARNINGS', | 3140 '_CRT_NONSTDC_NO_WARNINGS', |
3141 '_CRT_NONSTDC_NO_DEPRECATE', | 3141 '_CRT_NONSTDC_NO_DEPRECATE', |
3142 '_SCL_SECURE_NO_DEPRECATE', | 3142 '_SCL_SECURE_NO_DEPRECATE', |
3143 ], | 3143 ], |
3144 'msvs_disabled_warnings': [ | 3144 'msvs_disabled_warnings': [ |
| 3145 # forcing value to bool 'true' or 'false' (performance warning) |
3145 4800, | 3146 4800, |
3146 ], | 3147 ], |
3147 'msvs_settings': { | 3148 'msvs_settings': { |
3148 'VCCLCompilerTool': { | 3149 'VCCLCompilerTool': { |
3149 'WarningLevel': '3', | 3150 'WarningLevel': '3', |
3150 'WarnAsError': 'true', | 3151 'WarnAsError': 'true', |
3151 'Detect64BitPortabilityProblems': 'false', | 3152 'Detect64BitPortabilityProblems': 'false', |
3152 }, | 3153 }, |
3153 }, | 3154 }, |
3154 'conditions': [ | 3155 'conditions': [ |
(...skipping 2460 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5615 }, | 5616 }, |
5616 ], | 5617 ], |
5617 ], | 5618 ], |
5618 }, | 5619 }, |
5619 ], | 5620 ], |
5620 ['msvs_xtree_patched!=1', { | 5621 ['msvs_xtree_patched!=1', { |
5621 # If xtree hasn't been patched, then we disable C4702. Otherwise, | 5622 # If xtree hasn't been patched, then we disable C4702. Otherwise, |
5622 # it's enabled. This will generally only be true for system-level | 5623 # it's enabled. This will generally only be true for system-level |
5623 # installed Express users. | 5624 # installed Express users. |
5624 'msvs_disabled_warnings': [ | 5625 'msvs_disabled_warnings': [ |
5625 4702, | 5626 4702, # unreachable code |
5626 ], | 5627 ], |
5627 }], | 5628 }], |
5628 ], | 5629 ], |
5629 'msvs_system_include_dirs': [ | 5630 'msvs_system_include_dirs': [ |
5630 '<(windows_sdk_path)/Include/shared', | 5631 '<(windows_sdk_path)/Include/shared', |
5631 '<(windows_sdk_path)/Include/um', | 5632 '<(windows_sdk_path)/Include/um', |
5632 '<(windows_sdk_path)/Include/winrt', | 5633 '<(windows_sdk_path)/Include/winrt', |
5633 '$(VSInstallDir)/VC/atlmfc/include', | 5634 '$(VSInstallDir)/VC/atlmfc/include', |
5634 ], | 5635 ], |
5635 'msvs_cygwin_shell': 0, | 5636 'msvs_cygwin_shell': 0, |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5699 4512, # Assignment operator could not be generated | 5700 4512, # Assignment operator could not be generated |
5700 4610, # Object can never be instantiated | 5701 4610, # Object can never be instantiated |
5701 4838, # Narrowing conversion. Doesn't seem to be very useful. | 5702 4838, # Narrowing conversion. Doesn't seem to be very useful. |
5702 4995, # 'X': name was marked as #pragma deprecated | 5703 4995, # 'X': name was marked as #pragma deprecated |
5703 4996, # 'X': was declared deprecated (for GetVersionEx). | 5704 4996, # 'X': was declared deprecated (for GetVersionEx). |
5704 | 5705 |
5705 # These are variable shadowing warnings that are new in VS2015. We | 5706 # These are variable shadowing warnings that are new in VS2015. We |
5706 # 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 |
5707 # the RTM release in the /W4 set. | 5708 # the RTM release in the /W4 set. |
5708 4456, 4457, 4458, 4459, | 5709 4456, 4457, 4458, 4459, |
| 5710 |
| 5711 # TODO(brucedawson): http://crbug.com/554200 4312 is a VS |
| 5712 # 2015 64-bit warning for integer to larger pointer |
| 5713 4312, |
5709 ], | 5714 ], |
5710 'msvs_settings': { | 5715 'msvs_settings': { |
5711 'VCCLCompilerTool': { | 5716 'VCCLCompilerTool': { |
5712 'AdditionalOptions': ['/MP'], | 5717 'AdditionalOptions': ['/MP'], |
5713 'MinimalRebuild': 'false', | 5718 'MinimalRebuild': 'false', |
5714 'BufferSecurityCheck': 'true', | 5719 'BufferSecurityCheck': 'true', |
5715 'EnableFunctionLevelLinking': 'true', | 5720 'EnableFunctionLevelLinking': 'true', |
5716 'RuntimeTypeInfo': 'false', | 5721 'RuntimeTypeInfo': 'false', |
5717 'WarningLevel': '4', | 5722 'WarningLevel': '4', |
5718 'WarnAsError': 'true', | 5723 'WarnAsError': 'true', |
(...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6357 # settings in target dicts. SYMROOT is a special case, because many other | 6362 # settings in target dicts. SYMROOT is a special case, because many other |
6358 # Xcode variables depend on it, including variables such as | 6363 # Xcode variables depend on it, including variables such as |
6359 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6364 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
6360 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6365 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
6361 # files to appear (when present) in the UI as actual files and not red | 6366 # files to appear (when present) in the UI as actual files and not red |
6362 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6367 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
6363 # and therefore SYMROOT, needs to be set at the project level. | 6368 # and therefore SYMROOT, needs to be set at the project level. |
6364 'SYMROOT': '<(DEPTH)/xcodebuild', | 6369 'SYMROOT': '<(DEPTH)/xcodebuild', |
6365 }, | 6370 }, |
6366 } | 6371 } |
OLD | NEW |