Support Express for 2013 automatic toolchain
Pick up setting for Express 2013 to get WDK_DIR set (required
for ATL with Express).
Add additional "or 2013e" to build/common.gypi, but exclude
unneeded workaround for intsafe.h.
[email protected]
BUG=323300, 340358
Review URL: https://codereview.chromium.org/153143002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248747 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/build/common.gypi b/build/common.gypi
index d988972..cb9c8dd 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1591,7 +1591,7 @@
},{
'msvs_large_module_debug_link_mode%': '2', # Yes
}],
- ['MSVS_VERSION=="2012e" or MSVS_VERSION=="2010e"', {
+ ['MSVS_VERSION=="2013e" or MSVS_VERSION=="2012e" or MSVS_VERSION=="2010e"', {
'msvs_express%': 1,
'secure_atl%': 0,
},{
@@ -4531,12 +4531,14 @@
'<(windows_driver_kit_path)/inc/mfc42',
],
'target_conditions': [
- ['chromium_code', {
+ ['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',
],
