Noissue - Change build order for the include and library directories of ATL.

adblockplus.gyp

 {
   'includes': [
     'defaults.gypi',
     'common/common.gypi',
   ],
 
   'variables': {
     'build_type%': 'devbuild',
     'build_version%': '',
   },
@@ skipping 125 matching lines @@
       'src/plugin/PluginWbPassThrough.h',
       'src/plugin/ProtocolCF.h',
       'src/plugin/ProtocolCF.inl',
       'src/plugin/ProtocolImpl.h',
       'src/plugin/ProtocolImpl.inl',
       'src/plugin/Resource.h',
       'src/plugin/SinkPolicy.h',
       'src/plugin/SinkPolicy.inl',
     ],
     'include_dirs': [
+      '$(WINDDKDIR)/inc/atl71',
+      '$(VCInstallDir)atlmfc/include',
       '$(WindowsSDK_IncludePath)',
-      '$(VCInstallDir)atlmfc/include',
-      '$(WINDDKDIR)/inc/atl71',
     ],
     # See "Adding Visual Style Support to an Extension, Plug-in, MMC Snap-in or a DLL
     # That Is Brought into a Process" on the link here:
     # http://msdn.microsoft.com/en-us/library/windows/desktop/bb773175%28v=vs.85%29.aspx#using_manifests
     'defines': ['ISOLATION_AWARE_ENABLED'],
     'libraries': [
       '-lwinhttp',
       '-lshell32',
       '-lComctl32',
       '-lGdi32',
@@ skipping 13 matching lines @@
             'AdditionalDependencies': ['atls.lib'],
           },
         },
       },
     },
     'msvs_settings': {
       'VCLinkerTool': {
         'conditions': [[
           'target_arch=="ia32"', {
             'AdditionalLibraryDirectories': [
+              '$(WINDDKDIR)/lib/ATL/i386',
               '$(VCInstallDir)atlmfc/lib',
               '$(WindowsSDK_LibraryPath_x86)',
-              '$(WINDDKDIR)/lib/ATL/i386',
             ],
           }, {
             'AdditionalLibraryDirectories': [
+              '$(WINDDKDIR)/lib/ATL/amd64',
               '$(VCInstallDir)atlmfc/lib/amd64',
               '$(WindowsSDK_LibraryPath_x64)',
-              '$(WINDDKDIR)/lib/ATL/amd64',
             ],
           }
         ]],
         'DelayLoadDLLs': ['Shell32.dll'],
       },
     },
   },
 
   {
     'target_name': 'tests',
@@ skipping 49 matching lines @@
       'src/plugin/PluginMimeFilterClient.cpp',
       'src/plugin/PluginMutex.cpp',
       'src/plugin/PluginSettings.cpp',
       'src/plugin/PluginSystem.cpp',
       'src/plugin/PluginTabBase.cpp',
       'src/plugin/PluginUtil.cpp',
       'src/plugin/PluginWbPassthrough.cpp',
     ],
     'include_dirs': [
       '$(WINDDKDIR)/inc/atl71',
+      '$(VCInstallDir)atlmfc/include',
     ],
     'defines': [
       'WINVER=0x0501',
       'PRODUCT_ADBLOCKPLUS'
     ],
     'link_settings': {
       'libraries': ['-ladvapi32', '-lshell32', '-lole32', '-lComctl32', '-lGdi32'],
     },
     'msvs_settings': {
       'VCLinkerTool': {
         'SubSystem': '1', # Console
         'EntryPointSymbol': 'mainCRTStartup',
         'conditions': [[
           'target_arch=="ia32"', {
             'AdditionalLibraryDirectories': [
+              '$(WINDDKDIR)/lib/ATL/i386',
               '$(VCInstallDir)atlmfc/lib',
               '$(WindowsSDK_LibraryPath_x86)',
-              '$(WINDDKDIR)/lib/ATL/i386',
             ],
           }, {
             'AdditionalLibraryDirectories': [
+              '$(WINDDKDIR)/lib/ATL/amd64',
               '$(VCInstallDir)atlmfc/lib/amd64',
               '$(WindowsSDK_LibraryPath_x64)',
-              '$(WINDDKDIR)/lib/ATL/amd64',
             ],
           }
         ]],
       },
     },
     'configurations': {
       # 'libraries' is not allowed under 'configurations' :-(
       'Debug': {
         'msvs_settings': {
           'VCLinkerTool': {
             'AdditionalDependencies': ['atlsd.lib'],
           },
         },
       },
       'Release': {
         'msvs_settings': {
           'VCLinkerTool': {
             'AdditionalDependencies': ['atls.lib'],
           },
         },
       },
     },
   }]
 }