| 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 4904 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4915 'AdditionalLibraryDirectories': | 4915 'AdditionalLibraryDirectories': |
| 4916 ['<(windows_driver_kit_path)/lib/ATL/amd64'], | 4916 ['<(windows_driver_kit_path)/lib/ATL/amd64'], |
| 4917 }, | 4917 }, |
| 4918 'VCLinkerTool': { | 4918 'VCLinkerTool': { |
| 4919 'AdditionalLibraryDirectories': | 4919 'AdditionalLibraryDirectories': |
| 4920 ['<(windows_driver_kit_path)/lib/ATL/amd64'], | 4920 ['<(windows_driver_kit_path)/lib/ATL/amd64'], |
| 4921 }, | 4921 }, |
| 4922 }, | 4922 }, |
| 4923 }, | 4923 }, |
| 4924 }, | 4924 }, |
| 4925 # https://code.google.com/p/chromium/issues/detail?id=372451#c20 |
| 4926 # Warning 4702 ("Unreachable code") should be re-enabled once |
| 4927 # Express users are updated to VS2013 Update 2. |
| 4928 'msvs_disabled_warnings': [ |
| 4929 4702 |
| 4930 ], |
| 4925 'msvs_settings': { | 4931 'msvs_settings': { |
| 4926 'VCLinkerTool': { | 4932 'VCLinkerTool': { |
| 4927 # Explicitly required when using the ATL with express | 4933 # Explicitly required when using the ATL with express |
| 4928 'AdditionalDependencies': ['atlthunk.lib'], | 4934 'AdditionalDependencies': ['atlthunk.lib'], |
| 4929 | 4935 |
| 4930 # ATL 8.0 included in WDK 7.1 makes the linker to generate | 4936 # ATL 8.0 included in WDK 7.1 makes the linker to generate |
| 4931 # almost eight hundred LNK4254 and LNK4078 warnings: | 4937 # almost eight hundred LNK4254 and LNK4078 warnings: |
| 4932 # - warning LNK4254: section 'ATL' (50000040) merged into | 4938 # - warning LNK4254: section 'ATL' (50000040) merged into |
| 4933 # '.rdata' (40000040) with different attributes | 4939 # '.rdata' (40000040) with different attributes |
| 4934 # - warning LNK4078: multiple 'ATL' sections found with | 4940 # - warning LNK4078: multiple 'ATL' sections found with |
| 4935 # different attributes | 4941 # different attributes |
| 4936 'AdditionalOptions': ['/ignore:4254', '/ignore:4078'], | 4942 'AdditionalOptions': ['/ignore:4254', '/ignore:4078'], |
| 4937 }, | 4943 }, |
| 4938 }, | 4944 }, |
| 4939 'msvs_system_include_dirs': [ | 4945 'msvs_system_include_dirs': [ |
| 4940 '<(windows_driver_kit_path)/inc/atl71', | 4946 '<(windows_driver_kit_path)/inc/atl71', |
| 4941 '<(windows_driver_kit_path)/inc/mfc42', | 4947 '<(windows_driver_kit_path)/inc/mfc42', |
| 4942 ], | 4948 ], |
| 4943 }], | 4949 }], |
| 4944 ], | 4950 ], |
| 4945 'msvs_system_include_dirs': [ | 4951 'msvs_system_include_dirs': [ |
| 4946 '<(windows_sdk_path)/Include/shared', | 4952 '<(windows_sdk_path)/Include/shared', |
| 4947 '<(windows_sdk_path)/Include/um', | 4953 '<(windows_sdk_path)/Include/um', |
| 4948 '<(windows_sdk_path)/Include/winrt', | 4954 '<(windows_sdk_path)/Include/winrt', |
| 4949 '$(VSInstallDir)/VC/atlmfc/include', | 4955 '$(VSInstallDir)/VC/atlmfc/include', |
| 4950 ], | 4956 ], |
| 4951 'msvs_cygwin_shell': 0, | 4957 'msvs_cygwin_shell': 0, |
| 4952 'msvs_disabled_warnings': [4351, 4355, 4396, 4503, 4819, | 4958 'msvs_disabled_warnings': [ |
| 4959 4351, 4355, 4396, 4503, 4819, |
| 4953 # TODO(maruel): These warnings are level 4. They will be slowly | 4960 # TODO(maruel): These warnings are level 4. They will be slowly |
| 4954 # removed as code is fixed. | 4961 # removed as code is fixed. |
| 4955 4100, 4121, 4125, 4127, 4130, 4131, 4189, 4201, 4238, 4244, 4245, | 4962 4100, 4121, 4125, 4127, 4130, 4131, 4189, 4201, 4238, 4244, 4245, |
| 4956 4310, 4428, 4481, 4505, 4510, 4512, 4530, 4610, 4611, 4701, 4702, | 4963 4310, 4428, 4481, 4505, 4510, 4512, 4530, 4610, 4611, 4701, 4706, |
| 4957 4706, | |
| 4958 ], | 4964 ], |
| 4959 'msvs_settings': { | 4965 'msvs_settings': { |
| 4960 'VCCLCompilerTool': { | 4966 'VCCLCompilerTool': { |
| 4961 'AdditionalOptions': ['/MP'], | 4967 'AdditionalOptions': ['/MP'], |
| 4962 'MinimalRebuild': 'false', | 4968 'MinimalRebuild': 'false', |
| 4963 'BufferSecurityCheck': 'true', | 4969 'BufferSecurityCheck': 'true', |
| 4964 'EnableFunctionLevelLinking': 'true', | 4970 'EnableFunctionLevelLinking': 'true', |
| 4965 'RuntimeTypeInfo': 'false', | 4971 'RuntimeTypeInfo': 'false', |
| 4966 'WarningLevel': '4', | 4972 'WarningLevel': '4', |
| 4967 'WarnAsError': 'true', | 4973 'WarnAsError': 'true', |
| (...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5326 # settings in target dicts. SYMROOT is a special case, because many other | 5332 # settings in target dicts. SYMROOT is a special case, because many other |
| 5327 # Xcode variables depend on it, including variables such as | 5333 # Xcode variables depend on it, including variables such as |
| 5328 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5334 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5329 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5335 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5330 # files to appear (when present) in the UI as actual files and not red | 5336 # files to appear (when present) in the UI as actual files and not red |
| 5331 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5337 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5332 # and therefore SYMROOT, needs to be set at the project level. | 5338 # and therefore SYMROOT, needs to be set at the project level. |
| 5333 'SYMROOT': '<(DEPTH)/xcodebuild', | 5339 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5334 }, | 5340 }, |
| 5335 } | 5341 } |
| OLD | NEW |