Support Express for 2013 automatic toolchain

build/common.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 1573 matching lines @@
             'incremental_chrome_dll%': 1,
           }],
           # Don't do incremental linking for large modules on 32-bit or when
           # component=static_library as the toolchain fails due to the size of
           # the .ilk files.
           ['MSVS_OS_BITS==32 or component=="static_library"', {
             'msvs_large_module_debug_link_mode%': '1',  # No
           },{
             '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,
           },{
             'msvs_express%': 0,
             'secure_atl%': 1,
           }],
         ],
         'nacl_win64_defines': [
           # This flag is used to minimize dependencies when building
           # Native Client loader for 64-bit Windows.
@@ skipping 2919 matching lines @@
                 #   - warning LNK4078: multiple 'ATL' sections found with
                 #     different attributes
                 'AdditionalOptions': ['/ignore:4254', '/ignore:4078'],
               },
             },
             'msvs_system_include_dirs': [
               '<(windows_driver_kit_path)/inc/atl71',
               '<(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',
                 ],
                 'msvs_settings': {
                   'VCCLCompilerTool': {
                     'ForcedIncludeFiles': [ 'intsafe_workaround.h', ],
                   },
                 },
               }],
             ],
@@ skipping 330 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }