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

Side by Side Diff: build/common.gypi

Issue 233843003: Remove a few dead MSVS_VERSION checks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more Created 6 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/installer/mini_installer.gypi » ('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 1723 matching lines...) Expand 10 before | Expand all | Expand 10 after
1734 'incremental_chrome_dll%': 1, 1734 'incremental_chrome_dll%': 1,
1735 }], 1735 }],
1736 # Don't do incremental linking for large modules on 32-bit or when 1736 # Don't do incremental linking for large modules on 32-bit or when
1737 # component=static_library as the toolchain fails due to the size of 1737 # component=static_library as the toolchain fails due to the size of
1738 # the .ilk files. 1738 # the .ilk files.
1739 ['MSVS_OS_BITS==32 or component=="static_library"', { 1739 ['MSVS_OS_BITS==32 or component=="static_library"', {
1740 'msvs_large_module_debug_link_mode%': '1', # No 1740 'msvs_large_module_debug_link_mode%': '1', # No
1741 },{ 1741 },{
1742 'msvs_large_module_debug_link_mode%': '2', # Yes 1742 'msvs_large_module_debug_link_mode%': '2', # Yes
1743 }], 1743 }],
1744 ['MSVS_VERSION=="2013e" or MSVS_VERSION=="2012e" or MSVS_VERSION=="201 0e"', { 1744 ['MSVS_VERSION=="2013e"', {
1745 'msvs_express%': 1, 1745 'msvs_express%': 1,
1746 'secure_atl%': 0, 1746 'secure_atl%': 0,
1747 },{ 1747 },{
1748 'msvs_express%': 0, 1748 'msvs_express%': 0,
1749 'secure_atl%': 1, 1749 'secure_atl%': 1,
1750 }], 1750 }],
1751 ], 1751 ],
1752 'nacl_win64_defines': [ 1752 'nacl_win64_defines': [
1753 # This flag is used to minimize dependencies when building 1753 # This flag is used to minimize dependencies when building
1754 # Native Client loader for 64-bit Windows. 1754 # Native Client loader for 64-bit Windows.
(...skipping 3088 matching lines...) Expand 10 before | Expand all | Expand 10 after
4843 # '.rdata' (40000040) with different attributes 4843 # '.rdata' (40000040) with different attributes
4844 # - warning LNK4078: multiple 'ATL' sections found with 4844 # - warning LNK4078: multiple 'ATL' sections found with
4845 # different attributes 4845 # different attributes
4846 'AdditionalOptions': ['/ignore:4254', '/ignore:4078'], 4846 'AdditionalOptions': ['/ignore:4254', '/ignore:4078'],
4847 }, 4847 },
4848 }, 4848 },
4849 'msvs_system_include_dirs': [ 4849 'msvs_system_include_dirs': [
4850 '<(windows_driver_kit_path)/inc/atl71', 4850 '<(windows_driver_kit_path)/inc/atl71',
4851 '<(windows_driver_kit_path)/inc/mfc42', 4851 '<(windows_driver_kit_path)/inc/mfc42',
4852 ], 4852 ],
4853 'target_conditions': [
4854 ['chromium_code and MSVS_VERSION=="2010e"', {
4855 # Workaround for intsafe in 2010 Express + WDK.
4856 # ATL code uses intsafe.h and both intsafe.h and stdint.h
4857 # define INT8_MIN et al.
4858 # We can't use this workaround in third_party code because
4859 # it has various levels of intolerance for including stdint.h.
4860 # This is not necessary in 2013e, and should be removed once
4861 # mainline is switched: http://crbug.com/340358.
4862 'msvs_system_include_dirs': [
4863 '<(DEPTH)/build',
4864 ],
4865 'msvs_settings': {
4866 'VCCLCompilerTool': {
4867 'ForcedIncludeFiles': [ 'intsafe_workaround.h', ],
4868 },
4869 },
4870 }],
4871 ],
4872 }], 4853 }],
4873 ], 4854 ],
4874 'msvs_system_include_dirs': [ 4855 'msvs_system_include_dirs': [
4875 '<(windows_sdk_path)/Include/shared', 4856 '<(windows_sdk_path)/Include/shared',
4876 '<(windows_sdk_path)/Include/um', 4857 '<(windows_sdk_path)/Include/um',
4877 '<(windows_sdk_path)/Include/winrt', 4858 '<(windows_sdk_path)/Include/winrt',
4878 '$(VSInstallDir)/VC/atlmfc/include', 4859 '$(VSInstallDir)/VC/atlmfc/include',
4879 ], 4860 ],
4880 'msvs_cygwin_shell': 0, 4861 'msvs_cygwin_shell': 0,
4881 'msvs_disabled_warnings': [4351, 4355, 4396, 4503, 4819, 4862 'msvs_disabled_warnings': [4351, 4355, 4396, 4503, 4819,
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
4968 }], 4949 }],
4969 ], 4950 ],
4970 'conditions': [ 4951 'conditions': [
4971 ['clang==1', { 4952 ['clang==1', {
4972 # Building with Clang on Windows is a work in progress and very 4953 # Building with Clang on Windows is a work in progress and very
4973 # experimental. See crbug.com/82385. 4954 # experimental. See crbug.com/82385.
4974 'VCCLCompilerTool': { 4955 'VCCLCompilerTool': {
4975 'WarnAsError': 'false', 4956 'WarnAsError': 'false',
4976 'RuntimeTypeInfo': 'false', 4957 'RuntimeTypeInfo': 'false',
4977 'AdditionalOptions': [ 4958 'AdditionalOptions': [
4959 '-fmsc-version=1800',
4978 '/fallback', 4960 '/fallback',
4979 4961
4980 # Many files use intrinsics without including this header. 4962 # Many files use intrinsics without including this header.
4981 # TODO(hans): Fix those files, or move this to sub-GYPs. 4963 # TODO(hans): Fix those files, or move this to sub-GYPs.
4982 '/FIIntrin.h', 4964 '/FIIntrin.h',
4983 4965
4984 # TODO(hans): Make this list shorter eventually. 4966 # TODO(hans): Make this list shorter eventually.
4985 '-Qunused-arguments', 4967 '-Qunused-arguments',
4986 '-Wno-c++11-compat-deprecated-writable-strings', 4968 '-Wno-c++11-compat-deprecated-writable-strings',
4987 '-Wno-char-subscripts', 4969 '-Wno-char-subscripts',
(...skipping 24 matching lines...) Expand all
5012 '-Wno-tautological-compare', 4994 '-Wno-tautological-compare',
5013 '-Wno-unknown-pragmas', 4995 '-Wno-unknown-pragmas',
5014 '-Wno-unsequenced', 4996 '-Wno-unsequenced',
5015 '-Wno-unused-function', 4997 '-Wno-unused-function',
5016 '-Wno-unused-private-field', 4998 '-Wno-unused-private-field',
5017 '-Wno-unused-value', 4999 '-Wno-unused-value',
5018 '-Wno-unused-variable', 5000 '-Wno-unused-variable',
5019 '-ferror-limit=1', 5001 '-ferror-limit=1',
5020 ], 5002 ],
5021 }, 5003 },
5022 'conditions': [
5023 ['MSVS_VERSION=="2013" or MSVS_VERSION=="2013e"', {
5024 'VCCLCompilerTool': {
5025 'AdditionalOptions': [
5026 '-fmsc-version=1800',
5027 ],
5028 },
5029 }],
5030 ['MSVS_VERSION=="2010" or MSVS_VERSION=="2010e"', {
5031 'VCCLCompilerTool': {
5032 'AdditionalOptions': [
5033 '-fmsc-version=1600',
5034 ],
5035 },
5036 }],
5037 ],
5038 }], 5004 }],
5039 ['asan==1', { 5005 ['asan==1', {
5040 # ASan on Windows is a work in progress and very experimental. 5006 # ASan on Windows is a work in progress and very experimental.
5041 # See crbug.com/345874. 5007 # See crbug.com/345874.
5042 'VCCLCompilerTool': { 5008 'VCCLCompilerTool': {
5043 'AdditionalOptions': [ 5009 'AdditionalOptions': [
5044 '-fsanitize=address', 5010 '-fsanitize=address',
5045 ], 5011 ],
5046 }, 5012 },
5047 'VCLinkerTool': { 5013 'VCLinkerTool': {
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
5250 # settings in target dicts. SYMROOT is a special case, because many other 5216 # settings in target dicts. SYMROOT is a special case, because many other
5251 # Xcode variables depend on it, including variables such as 5217 # Xcode variables depend on it, including variables such as
5252 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5218 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5253 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5219 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5254 # files to appear (when present) in the UI as actual files and not red 5220 # files to appear (when present) in the UI as actual files and not red
5255 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5221 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5256 # and therefore SYMROOT, needs to be set at the project level. 5222 # and therefore SYMROOT, needs to be set at the project level.
5257 'SYMROOT': '<(DEPTH)/xcodebuild', 5223 'SYMROOT': '<(DEPTH)/xcodebuild',
5258 }, 5224 },
5259 } 5225 }
OLDNEW
« no previous file with comments | « no previous file | chrome/installer/mini_installer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698