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 3142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3153 ], | 3153 ], |
3154 }], | 3154 }], |
3155 [ 'OS=="win"', { | 3155 [ 'OS=="win"', { |
3156 'defines': [ | 3156 'defines': [ |
3157 '_CRT_SECURE_NO_DEPRECATE', | 3157 '_CRT_SECURE_NO_DEPRECATE', |
3158 '_CRT_NONSTDC_NO_WARNINGS', | 3158 '_CRT_NONSTDC_NO_WARNINGS', |
3159 '_CRT_NONSTDC_NO_DEPRECATE', | 3159 '_CRT_NONSTDC_NO_DEPRECATE', |
3160 '_SCL_SECURE_NO_DEPRECATE', | 3160 '_SCL_SECURE_NO_DEPRECATE', |
3161 ], | 3161 ], |
3162 'msvs_disabled_warnings': [ | 3162 'msvs_disabled_warnings': [ |
| 3163 # forcing value to bool 'true' or 'false' (performance warning) |
3163 4800, | 3164 4800, |
3164 ], | 3165 ], |
3165 'msvs_settings': { | 3166 'msvs_settings': { |
3166 'VCCLCompilerTool': { | 3167 'VCCLCompilerTool': { |
3167 'WarningLevel': '3', | 3168 'WarningLevel': '3', |
3168 'WarnAsError': 'true', | 3169 'WarnAsError': 'true', |
3169 'Detect64BitPortabilityProblems': 'false', | 3170 'Detect64BitPortabilityProblems': 'false', |
3170 }, | 3171 }, |
3171 }, | 3172 }, |
3172 'conditions': [ | 3173 'conditions': [ |
(...skipping 2480 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5653 }, | 5654 }, |
5654 ], | 5655 ], |
5655 ], | 5656 ], |
5656 }, | 5657 }, |
5657 ], | 5658 ], |
5658 ['msvs_xtree_patched!=1', { | 5659 ['msvs_xtree_patched!=1', { |
5659 # If xtree hasn't been patched, then we disable C4702. Otherwise, | 5660 # If xtree hasn't been patched, then we disable C4702. Otherwise, |
5660 # it's enabled. This will generally only be true for system-level | 5661 # it's enabled. This will generally only be true for system-level |
5661 # installed Express users. | 5662 # installed Express users. |
5662 'msvs_disabled_warnings': [ | 5663 'msvs_disabled_warnings': [ |
5663 4702, | 5664 4702, # unreachable code |
5664 ], | 5665 ], |
5665 }], | 5666 }], |
5666 ], | 5667 ], |
5667 'msvs_system_include_dirs': [ | 5668 'msvs_system_include_dirs': [ |
5668 '<(windows_sdk_path)/Include/10.0.10240.0/shared', | 5669 '<(windows_sdk_path)/Include/10.0.10240.0/shared', |
5669 '<(windows_sdk_path)/Include/10.0.10240.0/um', | 5670 '<(windows_sdk_path)/Include/10.0.10240.0/um', |
5670 '<(windows_sdk_path)/Include/10.0.10240.0/winrt', | 5671 '<(windows_sdk_path)/Include/10.0.10240.0/winrt', |
5671 '$(VSInstallDir)/VC/atlmfc/include', | 5672 '$(VSInstallDir)/VC/atlmfc/include', |
5672 ], | 5673 ], |
5673 'msvs_cygwin_shell': 0, | 5674 'msvs_cygwin_shell': 0, |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5737 4512, # Assignment operator could not be generated | 5738 4512, # Assignment operator could not be generated |
5738 4610, # Object can never be instantiated | 5739 4610, # Object can never be instantiated |
5739 4838, # Narrowing conversion. Doesn't seem to be very useful. | 5740 4838, # Narrowing conversion. Doesn't seem to be very useful. |
5740 4995, # 'X': name was marked as #pragma deprecated | 5741 4995, # 'X': name was marked as #pragma deprecated |
5741 4996, # 'X': was declared deprecated (for GetVersionEx). | 5742 4996, # 'X': was declared deprecated (for GetVersionEx). |
5742 | 5743 |
5743 # These are variable shadowing warnings that are new in VS2015. We | 5744 # These are variable shadowing warnings that are new in VS2015. We |
5744 # should work through these at some point -- they may be removed from | 5745 # should work through these at some point -- they may be removed from |
5745 # the RTM release in the /W4 set. | 5746 # the RTM release in the /W4 set. |
5746 4456, 4457, 4458, 4459, | 5747 4456, 4457, 4458, 4459, |
| 5748 |
| 5749 # TODO(brucedawson): http://crbug.com/554200 4312 is a VS |
| 5750 # 2015 64-bit warning for integer to larger pointer |
| 5751 4312, |
5747 ], | 5752 ], |
5748 'msvs_settings': { | 5753 'msvs_settings': { |
5749 'VCCLCompilerTool': { | 5754 'VCCLCompilerTool': { |
5750 'AdditionalOptions': ['/MP'], | 5755 'AdditionalOptions': ['/MP'], |
5751 'MinimalRebuild': 'false', | 5756 'MinimalRebuild': 'false', |
5752 'BufferSecurityCheck': 'true', | 5757 'BufferSecurityCheck': 'true', |
5753 'EnableFunctionLevelLinking': 'true', | 5758 'EnableFunctionLevelLinking': 'true', |
5754 'RuntimeTypeInfo': 'false', | 5759 'RuntimeTypeInfo': 'false', |
5755 'WarningLevel': '4', | 5760 'WarningLevel': '4', |
5756 'WarnAsError': 'true', | 5761 'WarnAsError': 'true', |
(...skipping 634 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6391 # settings in target dicts. SYMROOT is a special case, because many other | 6396 # settings in target dicts. SYMROOT is a special case, because many other |
6392 # Xcode variables depend on it, including variables such as | 6397 # Xcode variables depend on it, including variables such as |
6393 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6398 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
6394 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6399 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
6395 # files to appear (when present) in the UI as actual files and not red | 6400 # files to appear (when present) in the UI as actual files and not red |
6396 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6401 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
6397 # and therefore SYMROOT, needs to be set at the project level. | 6402 # and therefore SYMROOT, needs to be set at the project level. |
6398 'SYMROOT': '<(DEPTH)/xcodebuild', | 6403 'SYMROOT': '<(DEPTH)/xcodebuild', |
6399 }, | 6404 }, |
6400 } | 6405 } |
OLD | NEW |