| 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 3304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3315 'x64_Base': { | 3315 'x64_Base': { |
| 3316 'abstract': 1, | 3316 'abstract': 1, |
| 3317 'msvs_configuration_platform': 'x64', | 3317 'msvs_configuration_platform': 'x64', |
| 3318 'msvs_settings': { | 3318 'msvs_settings': { |
| 3319 'VCLinkerTool': { | 3319 'VCLinkerTool': { |
| 3320 # Make sure to understand http://crbug.com/361720 if you want to | 3320 # Make sure to understand http://crbug.com/361720 if you want to |
| 3321 # increase this. | 3321 # increase this. |
| 3322 'MinimumRequiredVersion': '5.02', # Server 2003. | 3322 'MinimumRequiredVersion': '5.02', # Server 2003. |
| 3323 'TargetMachine': '17', # x86 - 64 | 3323 'TargetMachine': '17', # x86 - 64 |
| 3324 'AdditionalLibraryDirectories!': | 3324 'AdditionalLibraryDirectories!': |
| 3325 ['<(windows_sdk_path)/Lib/10.0.10240.0/um/x86'], | 3325 ['<(windows_sdk_path)/Lib/10.0.10586.0/um/x86'], |
| 3326 'AdditionalLibraryDirectories': | 3326 'AdditionalLibraryDirectories': |
| 3327 ['<(windows_sdk_path)/Lib/10.0.10240.0/um/x64'], | 3327 ['<(windows_sdk_path)/Lib/10.0.10586.0/um/x64'], |
| 3328 # Doesn't exist x64 SDK. Should use oleaut32 in any case. | 3328 # Doesn't exist x64 SDK. Should use oleaut32 in any case. |
| 3329 'IgnoreDefaultLibraryNames': [ 'olepro32.lib' ], | 3329 'IgnoreDefaultLibraryNames': [ 'olepro32.lib' ], |
| 3330 }, | 3330 }, |
| 3331 'VCLibrarianTool': { | 3331 'VCLibrarianTool': { |
| 3332 'AdditionalLibraryDirectories!': | 3332 'AdditionalLibraryDirectories!': |
| 3333 ['<(windows_sdk_path)/Lib/10.0.10240.0/um/x86'], | 3333 ['<(windows_sdk_path)/Lib/10.0.10586.0/um/x86'], |
| 3334 'AdditionalLibraryDirectories': | 3334 'AdditionalLibraryDirectories': |
| 3335 ['<(windows_sdk_path)/Lib/10.0.10240.0/um/x64'], | 3335 ['<(windows_sdk_path)/Lib/10.0.10586.0/um/x64'], |
| 3336 'TargetMachine': '17', # x64 | 3336 'TargetMachine': '17', # x64 |
| 3337 }, | 3337 }, |
| 3338 }, | 3338 }, |
| 3339 }, | 3339 }, |
| 3340 'Debug_Base': { | 3340 'Debug_Base': { |
| 3341 'abstract': 1, | 3341 'abstract': 1, |
| 3342 'defines': [ | 3342 'defines': [ |
| 3343 'DYNAMIC_ANNOTATIONS_ENABLED=1', | 3343 'DYNAMIC_ANNOTATIONS_ENABLED=1', |
| 3344 'WTF_USE_DYNAMIC_ANNOTATIONS=1', | 3344 'WTF_USE_DYNAMIC_ANNOTATIONS=1', |
| 3345 ], | 3345 ], |
| (...skipping 2310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5656 ['msvs_xtree_patched!=1', { | 5656 ['msvs_xtree_patched!=1', { |
| 5657 # If xtree hasn't been patched, then we disable C4702. Otherwise, | 5657 # If xtree hasn't been patched, then we disable C4702. Otherwise, |
| 5658 # it's enabled. This will generally only be true for system-level | 5658 # it's enabled. This will generally only be true for system-level |
| 5659 # installed Express users. | 5659 # installed Express users. |
| 5660 'msvs_disabled_warnings': [ | 5660 'msvs_disabled_warnings': [ |
| 5661 4702, # unreachable code | 5661 4702, # unreachable code |
| 5662 ], | 5662 ], |
| 5663 }], | 5663 }], |
| 5664 ], | 5664 ], |
| 5665 'msvs_system_include_dirs': [ | 5665 'msvs_system_include_dirs': [ |
| 5666 '<(windows_sdk_path)/Include/10.0.10240.0/shared', | 5666 '<(windows_sdk_path)/Include/10.0.10586.0/shared', |
| 5667 '<(windows_sdk_path)/Include/10.0.10240.0/um', | 5667 '<(windows_sdk_path)/Include/10.0.10586.0/um', |
| 5668 '<(windows_sdk_path)/Include/10.0.10240.0/winrt', | 5668 '<(windows_sdk_path)/Include/10.0.10586.0/winrt', |
| 5669 '$(VSInstallDir)/VC/atlmfc/include', | 5669 '$(VSInstallDir)/VC/atlmfc/include', |
| 5670 ], | 5670 ], |
| 5671 'msvs_cygwin_shell': 0, | 5671 'msvs_cygwin_shell': 0, |
| 5672 'msvs_disabled_warnings': [ | 5672 'msvs_disabled_warnings': [ |
| 5673 # C4091: 'typedef ': ignored on left of 'X' when no variable is | 5673 # C4091: 'typedef ': ignored on left of 'X' when no variable is |
| 5674 # declared. | 5674 # declared. |
| 5675 # This happens in a number of Windows headers. Dumb. | 5675 # This happens in a number of Windows headers. Dumb. |
| 5676 4091, | 5676 4091, |
| 5677 | 5677 |
| 5678 # C4127: conditional expression is constant | 5678 # C4127: conditional expression is constant |
| (...skipping 704 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6383 # settings in target dicts. SYMROOT is a special case, because many other | 6383 # settings in target dicts. SYMROOT is a special case, because many other |
| 6384 # Xcode variables depend on it, including variables such as | 6384 # Xcode variables depend on it, including variables such as |
| 6385 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6385 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 6386 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6386 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 6387 # files to appear (when present) in the UI as actual files and not red | 6387 # files to appear (when present) in the UI as actual files and not red |
| 6388 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6388 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 6389 # and therefore SYMROOT, needs to be set at the project level. | 6389 # and therefore SYMROOT, needs to be set at the project level. |
| 6390 'SYMROOT': '<(DEPTH)/xcodebuild', | 6390 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 6391 }, | 6391 }, |
| 6392 } | 6392 } |
| OLD | NEW |