WinDDK ATL and MSVC express compatability

build/common.gypi

 # Copyright (c) 2010 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 1428 matching lines @@
       'target_defaults': {
         'defines': [
           '_WIN32_WINNT=0x0600',
           'WINVER=0x0600',
           'WIN32',
           '_WINDOWS',
           'NOMINMAX',
           '_CRT_RAND_S',
           'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',
           'WIN32_LEAN_AND_MEAN',
-          '_SECURE_ATL',
           '_ATL_NO_OPENGL',
           '_HAS_TR1=0',
         ],
         'conditions': [
           ['component=="static_library"', {
             'defines': [
               '_HAS_EXCEPTIONS=0',
             ],
           }],
         ],
@@ skipping 10 matching lines @@
             'BufferSecurityCheck': 'true',
             'EnableFunctionLevelLinking': 'true',
             'RuntimeTypeInfo': 'false',
             'WarningLevel': '3',
             'WarnAsError': 'true',
             'DebugInformationFormat': '3',
             'conditions': [
               [ 'msvs_multi_core_compile', {
                 'AdditionalOptions': ['/MP'],
               }],
+              [ 'MSVS_VERSION=="2010e" or MSVS_VERSION=="2008e" or MSVS_VERSION=="2005e"', {
+                'AdditionalOptions': ['/DCOMPILER_MSVCEXPRESS'],

[Mark Mentovai, 2011/03/16 16:25:20]

All of the other COMPILER_* macros are set in build/build_config.h. Isn’t there
some predefined macro that we can switch on in that file to set
COMPILER_MSVCEXPRESS?

I’d also favor COMPILER_MSVC_EXPRESS.

We’ll also want to nail down properly whether the “express” macro is a subset of
the ordinary COMPILER_MSVC macro.

[RN, 2011/03/17 06:33:25]

I do not think there is a way to get a macro for express editions. 

Changed to COMPILER_MSVC_EXPRESS.

As for whether to nail down whether or not make a subset of COMPILER_MSVC, I'm
not sure about that. I'll let the Chromium team decide that, though with this
approach at least for now I don't breaking code for other versions.

+              },{ 

[Mark Mentovai, 2011/03/16 16:25:20]

Most of the “else” blocks in this file put a space between the , and {. Try to
observe the surrounding style. Same on line 1486, where you’re changing an
existing “}, {” unnecessarily.

[RN, 2011/03/17 06:33:25]

I thought I was changing to the norm of the rest of the other .gyp* files, then
again it is a bit inconsistent. Changed.

+                'AdditionalOptions': ['/D_SECURE_ATL'], #WinDDKATL + _SECURE_ATL = error

[Mark Mentovai, 2011/03/16 16:25:20]

The general style would be two spaces before the # and one space after. Also
observe this convention on line 1509.

I don’t know what WinDDKATL is. It doesn’t show up anywhere else in this file
and Google’s results are less than helpful. I can figure out what I think you
mean from your changelist description, but I shouldn’t have to do that to
decipher a comment.

[RN, 2011/03/17 06:33:25]

Right, that was a bit terse. I changed that area a bit, I simply eliminated the
_SECURE_ATL define altogether - there is no clean way to get the Windows DDK's
(Driver Development Kit) version that gives an error when it is defined in the
same base header that gives the _ATL_VERSION define. _SECURE_ATL adds extra
checks to CRT calls it makes internally; the DDK version has it on by default.
Yeah, it was a bit terse and unneeded.

+              }],
               ['component=="shared_library"', {
                 'ExceptionHandling': '1',  # /EHsc
-              }, {
-                'ExceptionHandling': '0',
+              },{
+                'ExceptionHandling': '0',               

[Mark Mentovai, 2011/03/16 16:25:20]

Adding unnecessary whitespace here?

[RN, 2011/03/17 06:33:25]

Ug. It seems something keeps adding extra whitespace in odd places. Anyway,
fixed; thanks.

               }],
             ],
           },
           'VCLibrarianTool': {
             'AdditionalOptions': ['/ignore:4221'],
             'AdditionalLibraryDirectories': [
               '<(DEPTH)/third_party/platformsdk_win7/files/Lib',
               '<(DEPTH)/third_party/directxsdk/files/Lib/x86',
             ],
           },
           'VCLinkerTool': {
             'AdditionalDependencies': [
               'wininet.lib',
               'dnsapi.lib',
               'version.lib',
               'msimg32.lib',
               'ws2_32.lib',
               'usp10.lib',
               'psapi.lib',
               'dbghelp.lib',
             ],
+            'conditions': [ #Required by WinDDK ATL and explicitly in express
+              ['MSVS_VERSION=="2010e" or MSVS_VERSION=="2008e" or MSVS_VERSION=="2005e"', {

[Mark Mentovai, 2011/03/16 16:25:20]

Perhaps it would make sense to have some sort of “flavor” variable that’s set to
1 when an “express” variant is in use. It would be handy if this condition comes
up frequently.

[RN, 2011/03/17 06:33:25]

Done.

+                'AdditionalDependencies': [
+                  'atlthunk.lib',
+                ],
+              }],
+            ],
             'AdditionalLibraryDirectories': [
               '<(DEPTH)/third_party/platformsdk_win7/files/Lib',
               '<(DEPTH)/third_party/directxsdk/files/Lib/x86',
             ],
             'GenerateDebugInformation': 'true',
             'MapFileName': '$(OutDir)\\$(TargetName).map',
             'ImportLibrary': '$(OutDir)\\lib\\$(TargetName).lib',
             'FixedBaseAddress': '1',
             # SubSystem values:
             #   0 == not set
@@ skipping 103 matching lines @@
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: