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

Side by Side Diff: build/common.gypi

Issue 1390923002: Revert of win: Update to Win 10 SDK (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 months 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 | « DEPS ('k') | 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 1483 matching lines...) Expand 10 before | Expand all | Expand 10 after
1494 # has no full v8 debug, has size optimization and linker gc section, so that 1494 # has no full v8 debug, has size optimization and linker gc section, so that
1495 # we can build a debug version with acceptable size and performance. 1495 # we can build a debug version with acceptable size and performance.
1496 'android_full_debug%': 0, 1496 'android_full_debug%': 0,
1497 1497
1498 # Contains data about the attached devices for gyp_managed_install. 1498 # Contains data about the attached devices for gyp_managed_install.
1499 'build_device_config_path': '<(PRODUCT_DIR)/build_devices.cfg', 1499 'build_device_config_path': '<(PRODUCT_DIR)/build_devices.cfg',
1500 1500
1501 'sas_dll_exists': '<!pymod_do_main(dir_exists "<(sas_dll_path)")', 1501 'sas_dll_exists': '<!pymod_do_main(dir_exists "<(sas_dll_path)")',
1502 'wix_exists': '<!pymod_do_main(dir_exists "<(wix_path)")', 1502 'wix_exists': '<!pymod_do_main(dir_exists "<(wix_path)")',
1503 1503
1504 'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/10', 1504 'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.1',
1505 'directx_sdk_default_path': '<(DEPTH)/third_party/directxsdk/files', 1505 'directx_sdk_default_path': '<(DEPTH)/third_party/directxsdk/files',
1506 1506
1507 # Whether we are using the rlz library or not. Platforms like Android send 1507 # Whether we are using the rlz library or not. Platforms like Android send
1508 # rlz codes for searches but do not use the library. 1508 # rlz codes for searches but do not use the library.
1509 'enable_rlz_support%': 0, 1509 'enable_rlz_support%': 0,
1510 'enable_rlz%': 0, 1510 'enable_rlz%': 0,
1511 1511
1512 # Turns on the i18n support in V8. 1512 # Turns on the i18n support in V8.
1513 'v8_enable_i18n_support': 1, 1513 'v8_enable_i18n_support': 1,
1514 1514
(...skipping 1345 matching lines...) Expand 10 before | Expand all | Expand 10 after
2860 ], 2860 ],
2861 'include_dirs': [ 2861 'include_dirs': [
2862 '<(DEPTH)/third_party/kasko/include', 2862 '<(DEPTH)/third_party/kasko/include',
2863 ], 2863 ],
2864 }], 2864 }],
2865 ['OS=="win"', { 2865 ['OS=="win"', {
2866 'defines': [ 2866 'defines': [
2867 '__STD_C', 2867 '__STD_C',
2868 '_CRT_SECURE_NO_DEPRECATE', 2868 '_CRT_SECURE_NO_DEPRECATE',
2869 '_SCL_SECURE_NO_DEPRECATE', 2869 '_SCL_SECURE_NO_DEPRECATE',
2870 # This define is required to pull in the new Win 10 interfaces from 2870 # This define is required to pull in the new Win8 interfaces from
2871 # system headers like ShObjIdl.h. 2871 # system headers like ShObjIdl.h.
2872 'NTDDI_VERSION=0x0A000000', 2872 'NTDDI_VERSION=0x06030000',
2873 # This is required for ATL to use XP-safe versions of its functions. 2873 # This is required for ATL to use XP-safe versions of its functions.
2874 '_USING_V110_SDK71_', 2874 '_USING_V110_SDK71_',
2875 ], 2875 ],
2876 'include_dirs': [ 2876 'include_dirs': [
2877 '<(DEPTH)/third_party/wtl/include', 2877 '<(DEPTH)/third_party/wtl/include',
2878 ], 2878 ],
2879 'conditions': [ 2879 'conditions': [
2880 ['win_z7!=0', { 2880 ['win_z7!=0', {
2881 'msvs_settings': { 2881 'msvs_settings': {
2882 # Generates debug info when win_z7=1 2882 # Generates debug info when win_z7=1
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after
3332 'x64_Base': { 3332 'x64_Base': {
3333 'abstract': 1, 3333 'abstract': 1,
3334 'msvs_configuration_platform': 'x64', 3334 'msvs_configuration_platform': 'x64',
3335 'msvs_settings': { 3335 'msvs_settings': {
3336 'VCLinkerTool': { 3336 'VCLinkerTool': {
3337 # Make sure to understand http://crbug.com/361720 if you want to 3337 # Make sure to understand http://crbug.com/361720 if you want to
3338 # increase this. 3338 # increase this.
3339 'MinimumRequiredVersion': '5.02', # Server 2003. 3339 'MinimumRequiredVersion': '5.02', # Server 2003.
3340 'TargetMachine': '17', # x86 - 64 3340 'TargetMachine': '17', # x86 - 64
3341 'AdditionalLibraryDirectories!': 3341 'AdditionalLibraryDirectories!':
3342 ['<(windows_sdk_path)/Lib/10.0.10240.0/um/x86'], 3342 ['<(windows_sdk_path)/Lib/win8/um/x86'],
3343 'AdditionalLibraryDirectories': 3343 'AdditionalLibraryDirectories':
3344 ['<(windows_sdk_path)/Lib/10.0.10240.0/um/x64'], 3344 ['<(windows_sdk_path)/Lib/win8/um/x64'],
3345 # Doesn't exist x64 SDK. Should use oleaut32 in any case. 3345 # Doesn't exist x64 SDK. Should use oleaut32 in any case.
3346 'IgnoreDefaultLibraryNames': [ 'olepro32.lib' ], 3346 'IgnoreDefaultLibraryNames': [ 'olepro32.lib' ],
3347 }, 3347 },
3348 'VCLibrarianTool': { 3348 'VCLibrarianTool': {
3349 'AdditionalLibraryDirectories!': 3349 'AdditionalLibraryDirectories!':
3350 ['<(windows_sdk_path)/Lib/10.0.10240.0/um/x86'], 3350 ['<(windows_sdk_path)/Lib/win8/um/x86'],
3351 'AdditionalLibraryDirectories': 3351 'AdditionalLibraryDirectories':
3352 ['<(windows_sdk_path)/Lib/10.0.10240.0/um/x64'], 3352 ['<(windows_sdk_path)/Lib/win8/um/x64'],
3353 'TargetMachine': '17', # x64 3353 'TargetMachine': '17', # x64
3354 }, 3354 },
3355 }, 3355 },
3356 }, 3356 },
3357 'Debug_Base': { 3357 'Debug_Base': {
3358 'abstract': 1, 3358 'abstract': 1,
3359 'defines': [ 3359 'defines': [
3360 'DYNAMIC_ANNOTATIONS_ENABLED=1', 3360 'DYNAMIC_ANNOTATIONS_ENABLED=1',
3361 'WTF_USE_DYNAMIC_ANNOTATIONS=1', 3361 'WTF_USE_DYNAMIC_ANNOTATIONS=1',
3362 ], 3362 ],
(...skipping 2111 matching lines...) Expand 10 before | Expand all | Expand 10 after
5474 }], 5474 }],
5475 ], 5475 ],
5476 }, 5476 },
5477 }], 5477 }],
5478 ], # target_conditions 5478 ], # target_conditions
5479 }, # target_defaults 5479 }, # target_defaults
5480 }], # OS=="ios" 5480 }], # OS=="ios"
5481 ['OS=="win"', { 5481 ['OS=="win"', {
5482 'target_defaults': { 5482 'target_defaults': {
5483 'defines': [ 5483 'defines': [
5484 '_WIN32_WINNT=0x0A00', 5484 '_WIN32_WINNT=0x0603',
5485 'WINVER=0x0A00', 5485 'WINVER=0x0603',
5486 'WIN32', 5486 'WIN32',
5487 '_WINDOWS', 5487 '_WINDOWS',
5488 'NOMINMAX', 5488 'NOMINMAX',
5489 'PSAPI_VERSION=1', 5489 'PSAPI_VERSION=1',
5490 '_CRT_RAND_S', 5490 '_CRT_RAND_S',
5491 'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS', 5491 'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',
5492 'WIN32_LEAN_AND_MEAN', 5492 'WIN32_LEAN_AND_MEAN',
5493 '_ATL_NO_OPENGL', 5493 '_ATL_NO_OPENGL',
5494 '_SECURE_ATL', 5494 '_SECURE_ATL',
5495 # _HAS_EXCEPTIONS must match ExceptionHandling in msvs_settings. 5495 # _HAS_EXCEPTIONS must match ExceptionHandling in msvs_settings.
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
5585 ['msvs_xtree_patched!=1', { 5585 ['msvs_xtree_patched!=1', {
5586 # If xtree hasn't been patched, then we disable C4702. Otherwise, 5586 # If xtree hasn't been patched, then we disable C4702. Otherwise,
5587 # it's enabled. This will generally only be true for system-level 5587 # it's enabled. This will generally only be true for system-level
5588 # installed Express users. 5588 # installed Express users.
5589 'msvs_disabled_warnings': [ 5589 'msvs_disabled_warnings': [
5590 4702, 5590 4702,
5591 ], 5591 ],
5592 }], 5592 }],
5593 ], 5593 ],
5594 'msvs_system_include_dirs': [ 5594 'msvs_system_include_dirs': [
5595 '<(windows_sdk_path)/Include/10.0.10240.0/shared', 5595 '<(windows_sdk_path)/Include/shared',
5596 '<(windows_sdk_path)/Include/10.0.10240.0/um', 5596 '<(windows_sdk_path)/Include/um',
5597 '<(windows_sdk_path)/Include/10.0.10240.0/winrt', 5597 '<(windows_sdk_path)/Include/winrt',
5598 '$(VSInstallDir)/VC/atlmfc/include', 5598 '$(VSInstallDir)/VC/atlmfc/include',
5599 ], 5599 ],
5600 'msvs_cygwin_shell': 0, 5600 'msvs_cygwin_shell': 0,
5601 'msvs_disabled_warnings': [ 5601 'msvs_disabled_warnings': [
5602 # C4091: 'typedef ': ignored on left of 'X' when no variable is 5602 # C4091: 'typedef ': ignored on left of 'X' when no variable is
5603 # declared. 5603 # declared.
5604 # This happens in a number of Windows headers. Dumb. 5604 # This happens in a number of Windows headers. Dumb.
5605 4091, 5605 4091,
5606 5606
5607 # C4127: conditional expression is constant 5607 # C4127: conditional expression is constant
(...skipping 669 matching lines...) Expand 10 before | Expand all | Expand 10 after
6277 # settings in target dicts. SYMROOT is a special case, because many other 6277 # settings in target dicts. SYMROOT is a special case, because many other
6278 # Xcode variables depend on it, including variables such as 6278 # Xcode variables depend on it, including variables such as
6279 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6279 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6280 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6280 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6281 # files to appear (when present) in the UI as actual files and not red 6281 # files to appear (when present) in the UI as actual files and not red
6282 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6282 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6283 # and therefore SYMROOT, needs to be set at the project level. 6283 # and therefore SYMROOT, needs to be set at the project level.
6284 'SYMROOT': '<(DEPTH)/xcodebuild', 6284 'SYMROOT': '<(DEPTH)/xcodebuild',
6285 }, 6285 },
6286 } 6286 }
OLDNEW
« no previous file with comments | « DEPS ('k') | build/config/win/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698