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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/installer/mini_installer.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index c87ec6322947d3e3ffc9e4a46fab30ef06cc0ad1..ddc1422c97aeb094d3ae551a1175d20f732751cc 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1741,7 +1741,7 @@
},{
'msvs_large_module_debug_link_mode%': '2', # Yes
}],
- ['MSVS_VERSION=="2013e" or MSVS_VERSION=="2012e" or MSVS_VERSION=="2010e"', {
+ ['MSVS_VERSION=="2013e"', {
'msvs_express%': 1,
'secure_atl%': 0,
},{
@@ -4850,25 +4850,6 @@
'<(windows_driver_kit_path)/inc/atl71',
'<(windows_driver_kit_path)/inc/mfc42',
],
- 'target_conditions': [
- ['chromium_code and MSVS_VERSION=="2010e"', {
- # Workaround for intsafe in 2010 Express + WDK.
- # ATL code uses intsafe.h and both intsafe.h and stdint.h
- # define INT8_MIN et al.
- # We can't use this workaround in third_party code because
- # it has various levels of intolerance for including stdint.h.
- # This is not necessary in 2013e, and should be removed once
- # mainline is switched: http://crbug.com/340358.
- 'msvs_system_include_dirs': [
- '<(DEPTH)/build',
- ],
- 'msvs_settings': {
- 'VCCLCompilerTool': {
- 'ForcedIncludeFiles': [ 'intsafe_workaround.h', ],
- },
- },
- }],
- ],
}],
],
'msvs_system_include_dirs': [
@@ -4975,6 +4956,7 @@
'WarnAsError': 'false',
'RuntimeTypeInfo': 'false',
'AdditionalOptions': [
+ '-fmsc-version=1800',
'/fallback',
# Many files use intrinsics without including this header.
@@ -5019,22 +5001,6 @@
'-ferror-limit=1',
],
},
- 'conditions': [
- ['MSVS_VERSION=="2013" or MSVS_VERSION=="2013e"', {
- 'VCCLCompilerTool': {
- 'AdditionalOptions': [
- '-fmsc-version=1800',
- ],
- },
- }],
- ['MSVS_VERSION=="2010" or MSVS_VERSION=="2010e"', {
- 'VCCLCompilerTool': {
- 'AdditionalOptions': [
- '-fmsc-version=1600',
- ],
- },
- }],
- ],
}],
['asan==1', {
# ASan on Windows is a work in progress and very experimental.
« 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