Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(611)

Side by Side Diff: build/common.gypi

Issue 1378153003: win: Update to Win 10 SDK (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase for reland Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | build/config/win/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1481 matching lines...) Expand 10 before | Expand all | Expand 10 after
1492 # has no full v8 debug, has size optimization and linker gc section, so that 1492 # has no full v8 debug, has size optimization and linker gc section, so that
1493 # we can build a debug version with acceptable size and performance. 1493 # we can build a debug version with acceptable size and performance.
1494 'android_full_debug%': 0, 1494 'android_full_debug%': 0,
1495 1495
1496 # Contains data about the attached devices for gyp_managed_install. 1496 # Contains data about the attached devices for gyp_managed_install.
1497 'build_device_config_path': '<(PRODUCT_DIR)/build_devices.cfg', 1497 'build_device_config_path': '<(PRODUCT_DIR)/build_devices.cfg',
1498 1498
1499 'sas_dll_exists': '<!pymod_do_main(dir_exists "<(sas_dll_path)")', 1499 'sas_dll_exists': '<!pymod_do_main(dir_exists "<(sas_dll_path)")',
1500 'wix_exists': '<!pymod_do_main(dir_exists "<(wix_path)")', 1500 'wix_exists': '<!pymod_do_main(dir_exists "<(wix_path)")',
1501 1501
1502 'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.1', 1502 'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/10',
1503 'directx_sdk_default_path': '<(DEPTH)/third_party/directxsdk/files', 1503 'directx_sdk_default_path': '<(DEPTH)/third_party/directxsdk/files',
1504 1504
1505 # Whether we are using the rlz library or not. Platforms like Android send 1505 # Whether we are using the rlz library or not. Platforms like Android send
1506 # rlz codes for searches but do not use the library. 1506 # rlz codes for searches but do not use the library.
1507 'enable_rlz_support%': 0, 1507 'enable_rlz_support%': 0,
1508 'enable_rlz%': 0, 1508 'enable_rlz%': 0,
1509 1509
1510 # Turns on the i18n support in V8. 1510 # Turns on the i18n support in V8.
1511 'v8_enable_i18n_support': 1, 1511 'v8_enable_i18n_support': 1,
1512 1512
(...skipping 1359 matching lines...) Expand 10 before | Expand all | Expand 10 after
2872 ], 2872 ],
2873 'include_dirs': [ 2873 'include_dirs': [
2874 '<(DEPTH)/third_party/kasko/include', 2874 '<(DEPTH)/third_party/kasko/include',
2875 ], 2875 ],
2876 }], 2876 }],
2877 ['OS=="win"', { 2877 ['OS=="win"', {
2878 'defines': [ 2878 'defines': [
2879 '__STD_C', 2879 '__STD_C',
2880 '_CRT_SECURE_NO_DEPRECATE', 2880 '_CRT_SECURE_NO_DEPRECATE',
2881 '_SCL_SECURE_NO_DEPRECATE', 2881 '_SCL_SECURE_NO_DEPRECATE',
2882 # This define is required to pull in the new Win8 interfaces from 2882 # This define is required to pull in the new Win 10 interfaces from
2883 # system headers like ShObjIdl.h. 2883 # system headers like ShObjIdl.h.
2884 'NTDDI_VERSION=0x06030000', 2884 'NTDDI_VERSION=0x0A000000',
2885 # This is required for ATL to use XP-safe versions of its functions. 2885 # This is required for ATL to use XP-safe versions of its functions.
2886 '_USING_V110_SDK71_', 2886 '_USING_V110_SDK71_',
2887 ], 2887 ],
2888 'include_dirs': [ 2888 'include_dirs': [
2889 '<(DEPTH)/third_party/wtl/include', 2889 '<(DEPTH)/third_party/wtl/include',
2890 ], 2890 ],
2891 'conditions': [ 2891 'conditions': [
2892 ['win_z7!=0', { 2892 ['win_z7!=0', {
2893 'msvs_settings': { 2893 'msvs_settings': {
2894 # Generates debug info when win_z7=1 2894 # Generates debug info when win_z7=1
(...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after
3329 'x64_Base': { 3329 'x64_Base': {
3330 'abstract': 1, 3330 'abstract': 1,
3331 'msvs_configuration_platform': 'x64', 3331 'msvs_configuration_platform': 'x64',
3332 'msvs_settings': { 3332 'msvs_settings': {
3333 'VCLinkerTool': { 3333 'VCLinkerTool': {
3334 # Make sure to understand http://crbug.com/361720 if you want to 3334 # Make sure to understand http://crbug.com/361720 if you want to
3335 # increase this. 3335 # increase this.
3336 'MinimumRequiredVersion': '5.02', # Server 2003. 3336 'MinimumRequiredVersion': '5.02', # Server 2003.
3337 'TargetMachine': '17', # x86 - 64 3337 'TargetMachine': '17', # x86 - 64
3338 'AdditionalLibraryDirectories!': 3338 'AdditionalLibraryDirectories!':
3339 ['<(windows_sdk_path)/Lib/win8/um/x86'], 3339 ['<(windows_sdk_path)/Lib/10.0.10240.0/um/x86'],
3340 'AdditionalLibraryDirectories': 3340 'AdditionalLibraryDirectories':
3341 ['<(windows_sdk_path)/Lib/win8/um/x64'], 3341 ['<(windows_sdk_path)/Lib/10.0.10240.0/um/x64'],
3342 # Doesn't exist x64 SDK. Should use oleaut32 in any case. 3342 # Doesn't exist x64 SDK. Should use oleaut32 in any case.
3343 'IgnoreDefaultLibraryNames': [ 'olepro32.lib' ], 3343 'IgnoreDefaultLibraryNames': [ 'olepro32.lib' ],
3344 }, 3344 },
3345 'VCLibrarianTool': { 3345 'VCLibrarianTool': {
3346 'AdditionalLibraryDirectories!': 3346 'AdditionalLibraryDirectories!':
3347 ['<(windows_sdk_path)/Lib/win8/um/x86'], 3347 ['<(windows_sdk_path)/Lib/10.0.10240.0/um/x86'],
3348 'AdditionalLibraryDirectories': 3348 'AdditionalLibraryDirectories':
3349 ['<(windows_sdk_path)/Lib/win8/um/x64'], 3349 ['<(windows_sdk_path)/Lib/10.0.10240.0/um/x64'],
3350 'TargetMachine': '17', # x64 3350 'TargetMachine': '17', # x64
3351 }, 3351 },
3352 }, 3352 },
3353 }, 3353 },
3354 'Debug_Base': { 3354 'Debug_Base': {
3355 'abstract': 1, 3355 'abstract': 1,
3356 'defines': [ 3356 'defines': [
3357 'DYNAMIC_ANNOTATIONS_ENABLED=1', 3357 'DYNAMIC_ANNOTATIONS_ENABLED=1',
3358 'WTF_USE_DYNAMIC_ANNOTATIONS=1', 3358 'WTF_USE_DYNAMIC_ANNOTATIONS=1',
3359 ], 3359 ],
(...skipping 2187 matching lines...) Expand 10 before | Expand all | Expand 10 after
5547 }], 5547 }],
5548 ], 5548 ],
5549 }, 5549 },
5550 }], 5550 }],
5551 ], # target_conditions 5551 ], # target_conditions
5552 }, # target_defaults 5552 }, # target_defaults
5553 }], # OS=="ios" 5553 }], # OS=="ios"
5554 ['OS=="win"', { 5554 ['OS=="win"', {
5555 'target_defaults': { 5555 'target_defaults': {
5556 'defines': [ 5556 'defines': [
5557 '_WIN32_WINNT=0x0603', 5557 '_WIN32_WINNT=0x0A00',
5558 'WINVER=0x0603', 5558 'WINVER=0x0A00',
5559 'WIN32', 5559 'WIN32',
5560 '_WINDOWS', 5560 '_WINDOWS',
5561 'NOMINMAX', 5561 'NOMINMAX',
5562 'PSAPI_VERSION=1', 5562 'PSAPI_VERSION=1',
5563 '_CRT_RAND_S', 5563 '_CRT_RAND_S',
5564 'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS', 5564 'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',
5565 'WIN32_LEAN_AND_MEAN', 5565 'WIN32_LEAN_AND_MEAN',
5566 '_ATL_NO_OPENGL', 5566 '_ATL_NO_OPENGL',
5567 '_SECURE_ATL', 5567 '_SECURE_ATL',
5568 # _HAS_EXCEPTIONS must match ExceptionHandling in msvs_settings. 5568 # _HAS_EXCEPTIONS must match ExceptionHandling in msvs_settings.
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
5658 ['msvs_xtree_patched!=1', { 5658 ['msvs_xtree_patched!=1', {
5659 # If xtree hasn't been patched, then we disable C4702. Otherwise, 5659 # If xtree hasn't been patched, then we disable C4702. Otherwise,
5660 # it's enabled. This will generally only be true for system-level 5660 # it's enabled. This will generally only be true for system-level
5661 # installed Express users. 5661 # installed Express users.
5662 'msvs_disabled_warnings': [ 5662 'msvs_disabled_warnings': [
5663 4702, 5663 4702,
5664 ], 5664 ],
5665 }], 5665 }],
5666 ], 5666 ],
5667 'msvs_system_include_dirs': [ 5667 'msvs_system_include_dirs': [
5668 '<(windows_sdk_path)/Include/shared', 5668 '<(windows_sdk_path)/Include/10.0.10240.0/shared',
5669 '<(windows_sdk_path)/Include/um', 5669 '<(windows_sdk_path)/Include/10.0.10240.0/um',
5670 '<(windows_sdk_path)/Include/winrt', 5670 '<(windows_sdk_path)/Include/10.0.10240.0/winrt',
5671 '$(VSInstallDir)/VC/atlmfc/include', 5671 '$(VSInstallDir)/VC/atlmfc/include',
5672 ], 5672 ],
5673 'msvs_cygwin_shell': 0, 5673 'msvs_cygwin_shell': 0,
5674 'msvs_disabled_warnings': [ 5674 'msvs_disabled_warnings': [
5675 # C4091: 'typedef ': ignored on left of 'X' when no variable is 5675 # C4091: 'typedef ': ignored on left of 'X' when no variable is
5676 # declared. 5676 # declared.
5677 # This happens in a number of Windows headers. Dumb. 5677 # This happens in a number of Windows headers. Dumb.
5678 4091, 5678 4091,
5679 5679
5680 # C4127: conditional expression is constant 5680 # C4127: conditional expression is constant
(...skipping 672 matching lines...) Expand 10 before | Expand all | Expand 10 after
6353 # settings in target dicts. SYMROOT is a special case, because many other 6353 # settings in target dicts. SYMROOT is a special case, because many other
6354 # Xcode variables depend on it, including variables such as 6354 # Xcode variables depend on it, including variables such as
6355 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6355 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6356 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6356 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6357 # files to appear (when present) in the UI as actual files and not red 6357 # files to appear (when present) in the UI as actual files and not red
6358 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6358 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6359 # and therefore SYMROOT, needs to be set at the project level. 6359 # and therefore SYMROOT, needs to be set at the project level.
6360 'SYMROOT': '<(DEPTH)/xcodebuild', 6360 'SYMROOT': '<(DEPTH)/xcodebuild',
6361 }, 6361 },
6362 } 6362 }
OLDNEW
« no previous file with comments | « no previous file | build/config/win/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698