Chromium Code Reviews| 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 3016 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3027 '-Wno-unused-result', | 3027 '-Wno-unused-result', |
| 3028 ], | 3028 ], |
| 3029 }], | 3029 }], |
| 3030 [ 'OS=="win"', { | 3030 [ 'OS=="win"', { |
| 3031 'defines': [ | 3031 'defines': [ |
| 3032 '_CRT_SECURE_NO_DEPRECATE', | 3032 '_CRT_SECURE_NO_DEPRECATE', |
| 3033 '_CRT_NONSTDC_NO_WARNINGS', | 3033 '_CRT_NONSTDC_NO_WARNINGS', |
| 3034 '_CRT_NONSTDC_NO_DEPRECATE', | 3034 '_CRT_NONSTDC_NO_DEPRECATE', |
| 3035 '_SCL_SECURE_NO_DEPRECATE', | 3035 '_SCL_SECURE_NO_DEPRECATE', |
| 3036 ], | 3036 ], |
| 3037 'msvs_disabled_warnings': [4800], | 3037 'msvs_disabled_warnings': [ |
| 3038 # These are variable shadowing warnings that are new in VS2015. | |
| 3039 # We should probably work through these at some point for | |
| 3040 # non-chromium code, but for now, focus on chromium_code==1 code. | |
| 3041 4456, 4457, 4458, 4459, | |
| 3042 | |
| 3043 4800, | |
| 3044 ], | |
| 3038 'msvs_settings': { | 3045 'msvs_settings': { |
| 3039 'VCCLCompilerTool': { | 3046 'VCCLCompilerTool': { |
| 3040 'WarningLevel': '3', | 3047 'WarningLevel': '3', |
| 3041 'WarnAsError': 'true', | 3048 'WarnAsError': 'true', |
| 3042 'Detect64BitPortabilityProblems': 'false', | 3049 'Detect64BitPortabilityProblems': 'false', |
| 3043 }, | 3050 }, |
| 3044 }, | 3051 }, |
| 3045 'conditions': [ | 3052 'conditions': [ |
| 3046 ['buildtype=="Official"', { | 3053 ['buildtype=="Official"', { |
| 3047 'msvs_settings': { | 3054 'msvs_settings': { |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3149 'odbc32.lib', | 3156 'odbc32.lib', |
| 3150 'odbccp32.lib', | 3157 'odbccp32.lib', |
| 3151 'delayimp.lib', | 3158 'delayimp.lib', |
| 3152 'credui.lib', | 3159 'credui.lib', |
| 3153 'netapi32.lib', | 3160 'netapi32.lib', |
| 3154 ], | 3161 ], |
| 3155 'AdditionalOptions': [ | 3162 'AdditionalOptions': [ |
| 3156 # Suggested by Microsoft Devrel to avoid | 3163 # Suggested by Microsoft Devrel to avoid |
| 3157 # LINK : fatal error LNK1248: image size (80000000) exceeds maxi mum allowable size (80000000) | 3164 # LINK : fatal error LNK1248: image size (80000000) exceeds maxi mum allowable size (80000000) |
| 3158 # which started happening more regularly after VS2013 Update 4. | 3165 # which started happening more regularly after VS2013 Update 4. |
| 3159 '/maxilksize:2147483647', | 3166 # Needs to be a bit lower for VS2015, or else errors out. |
| 3167 '/maxilksize:0x7ff00000', | |
|
brucedawson
2015/02/20 18:09:03
Good. I hit the same error in some VS 2013 context
| |
| 3160 ], | 3168 ], |
| 3161 }, | 3169 }, |
| 3162 }, | 3170 }, |
| 3163 }, | 3171 }, |
| 3164 'x86_Base': { | 3172 'x86_Base': { |
| 3165 'abstract': 1, | 3173 'abstract': 1, |
| 3166 'msvs_settings': { | 3174 'msvs_settings': { |
| 3167 'VCLinkerTool': { | 3175 'VCLinkerTool': { |
| 3168 'MinimumRequiredVersion': '5.01', # XP. | 3176 'MinimumRequiredVersion': '5.01', # XP. |
| 3169 'TargetMachine': '1', | 3177 'TargetMachine': '1', |
| (...skipping 2212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5382 }], | 5390 }], |
| 5383 ], | 5391 ], |
| 5384 'msvs_system_include_dirs': [ | 5392 'msvs_system_include_dirs': [ |
| 5385 '<(windows_sdk_path)/Include/shared', | 5393 '<(windows_sdk_path)/Include/shared', |
| 5386 '<(windows_sdk_path)/Include/um', | 5394 '<(windows_sdk_path)/Include/um', |
| 5387 '<(windows_sdk_path)/Include/winrt', | 5395 '<(windows_sdk_path)/Include/winrt', |
| 5388 '$(VSInstallDir)/VC/atlmfc/include', | 5396 '$(VSInstallDir)/VC/atlmfc/include', |
| 5389 ], | 5397 ], |
| 5390 'msvs_cygwin_shell': 0, | 5398 'msvs_cygwin_shell': 0, |
| 5391 'msvs_disabled_warnings': [ | 5399 'msvs_disabled_warnings': [ |
| 5400 # C4091: 'typedef ': ignored on left of 'X' when no variable is | |
| 5401 # declared. | |
| 5402 # This happens in a number of Windows headers. Dumb. | |
| 5403 4091, | |
| 5404 | |
| 5392 # C4127: conditional expression is constant | 5405 # C4127: conditional expression is constant |
| 5393 # This warning can in theory catch dead code and other problems, but | 5406 # This warning can in theory catch dead code and other problems, but |
| 5394 # triggers in far too many desirable cases where the conditional | 5407 # triggers in far too many desirable cases where the conditional |
| 5395 # expression is either set by macros or corresponds some legitimate | 5408 # expression is either set by macros or corresponds some legitimate |
| 5396 # compile-time constant expression (due to constant template args, | 5409 # compile-time constant expression (due to constant template args, |
| 5397 # conditionals comparing the sizes of different types, etc.). Some of | 5410 # conditionals comparing the sizes of different types, etc.). Some of |
| 5398 # these can be worked around, but it's not worth it. | 5411 # these can be worked around, but it's not worth it. |
| 5399 4127, | 5412 4127, |
| 5400 | 5413 |
| 5401 # C4351: new behavior: elements of array 'array' will be default | 5414 # C4351: new behavior: elements of array 'array' will be default |
| (...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5918 # settings in target dicts. SYMROOT is a special case, because many other | 5931 # settings in target dicts. SYMROOT is a special case, because many other |
| 5919 # Xcode variables depend on it, including variables such as | 5932 # Xcode variables depend on it, including variables such as |
| 5920 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5933 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5921 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5934 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5922 # files to appear (when present) in the UI as actual files and not red | 5935 # files to appear (when present) in the UI as actual files and not red |
| 5923 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5936 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5924 # and therefore SYMROOT, needs to be set at the project level. | 5937 # and therefore SYMROOT, needs to be set at the project level. |
| 5925 'SYMROOT': '<(DEPTH)/xcodebuild', | 5938 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5926 }, | 5939 }, |
| 5927 } | 5940 } |
| OLD | NEW |