Issue 2599, 2940 - Fix the presence of correct ATL version

adblockplus.gyp

 {
   'includes': [
     'defaults.gypi',
     'common/common.gypi',
   ],
 
   'variables': {
     'build_type%': 'devbuild',
     'build_version%': '',
   },
@@ skipping 34 matching lines @@
       'src/shared/Communication.cpp',
       'src/shared/Communication.h',
       'src/shared/CriticalSection.h',
       'src/shared/Dictionary.cpp',
       'src/shared/Dictionary.h',
       'src/shared/Utils.cpp',
       'src/shared/Utils.h',
       'src/shared/Version.h',
       'src/shared/MsHTMLUtils.cpp',
       'src/shared/MsHTMLUtils.h',
-      ]
+    ],
+    'include_dirs': [
+      '$(WindowsSDK_IncludePath)',

[Eric, 2015/10/08 14:36:36]

We don't need any of the "WindowsSDK_*" environment variables anywhere in the
gyp file. They should all go. It's just path-junk, and it's prudent to remove it
so that it can't introduce spurious conflicts.

I've tested that you can remove all these lines and get a clean compile. That's
only for my own configuration, though. It needs to be tested for a paid VS 2012
configuration.

[sergei, 2015/10/21 11:55:50]

Done.

+      '$(VCInstallDir_120)/atlmfc/include',
+    ],
   },
 
   {
     'target_name': 'AdblockPlusEngine',
     'type': 'executable',
     'dependencies': [
       'shared',
       'libadblockplus/libadblockplus.gyp:libadblockplus',
     ],
     'sources': [
       'src/engine/Main.cpp',
       'src/engine/NotificationWindow.cpp',
       'src/engine/NotificationWindow.h',
       'src/engine/Debug.cpp',
       'src/engine/UpdateInstallDialog.cpp',
       'src/engine/Updater.cpp',
       'src/engine/engine.rc',
     ],
+    'include_dirs': [
+      '$(WindowsSDK_IncludePath)',
+      '$(VCInstallDir_120)/atlmfc/include',
+    ],
     'libraries': [
       '-ladvapi32',
       '-lole32',
       '-luser32',
       '-lshell32',
       '-lshlwapi',
     ],
     'msbuild_toolset': 'v110_xp',
     'msvs_settings': {
       'VCLinkerTool': {
         'DelayLoadDLLs': ['Shell32.dll'],
+        'conditions': [[
+          'target_arch=="ia32"', {
+            'AdditionalLibraryDirectories': [
+              '$(WindowsSDK_LibraryPath_x86)',
+              '$(VCInstallDir_120)/atlmfc/lib',
+            ],
+          }, {
+            'AdditionalLibraryDirectories': [
+              '$(WindowsSDK_LibraryPath_x64)',
+              '$(VCInstallDir_120)/atlmfc/lib/amd64',
+            ],
+          }
+        ]],
+        'DelayLoadDLLs': ['Shell32.dll'],

[Eric, 2015/10/08 14:36:36]

This line seems to be duplicated.

[sergei, 2015/10/21 11:55:50]

Done.

       },
     },
   },
 
   {
     'target_name': 'AdblockPlus',
     'type': 'shared_library',
     'dependencies': [
       'shared',
       'libadblockplus/libadblockplus.gyp:libadblockplus',
@@ skipping 50 matching lines @@
       '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': [
       '$(WindowsSDK_IncludePath)',
-      '$(VCInstallDir)atlmfc/include',
-      '$(WINDDKDIR)/inc/atl71',

[Eric, 2015/10/08 14:36:35]

The DDK directory illustrates why the SDK paths can go. We were only using the
DDK as a (now-obsolete) source of ATL. The SDK, as I recall, was the even-older
source, and then Microsoft removed ATL from the SDK and moved it to the DDK.

+      '$(VCInstallDir_120)/atlmfc/include',
     ],
     # 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',
     ],
-    'configurations': {
-      # 'libraries' is not allowed under 'configurations' :-(
-      'Debug': {
-        'msvs_settings': {
-          'VCLinkerTool': {
-            'AdditionalDependencies': ['atlsd.lib'],
-          },
-        },
-      },
-      'Release': {
-        'msvs_settings': {
-          'VCLinkerTool': {
-            'AdditionalDependencies': ['atls.lib'],
-          },
-        },
-      },
-    },
     'msvs_settings': {
       'VCLinkerTool': {
         'conditions': [[
           'target_arch=="ia32"', {
             'AdditionalLibraryDirectories': [
-              '$(VCInstallDir)atlmfc/lib',
               '$(WindowsSDK_LibraryPath_x86)',
-              '$(WINDDKDIR)/lib/ATL/i386',
+              '$(VCInstallDir_120)/atlmfc/lib',
             ],
           }, {
             'AdditionalLibraryDirectories': [
-              '$(VCInstallDir)atlmfc/lib/amd64',
               '$(WindowsSDK_LibraryPath_x64)',
-              '$(WINDDKDIR)/lib/ATL/amd64',
+              '$(VCInstallDir_120)/atlmfc/lib/amd64',
             ],
           }
         ]],
         'DelayLoadDLLs': ['Shell32.dll'],
       },
     },
   },
 
   {
     'target_name': 'tests',
@@ skipping 48 matching lines @@
       'src/plugin/PluginFilter.cpp',
       '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',
+      '$(WindowsSDK_IncludePath)',
+      '$(VCInstallDir_120)/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': [
-              '$(VCInstallDir)atlmfc/lib',
               '$(WindowsSDK_LibraryPath_x86)',
-              '$(WINDDKDIR)/lib/ATL/i386',
+              '$(VCInstallDir_120)/atlmfc/lib',
             ],
           }, {
             'AdditionalLibraryDirectories': [
-              '$(VCInstallDir)atlmfc/lib/amd64',
               '$(WindowsSDK_LibraryPath_x64)',
-              '$(WINDDKDIR)/lib/ATL/amd64',
+              '$(VCInstallDir_120)/atlmfc/lib/amd64',
             ],
           }
         ]],
       },
     },
-    'configurations': {
-      # 'libraries' is not allowed under 'configurations' :-(
-      'Debug': {
-        'msvs_settings': {
-          'VCLinkerTool': {
-            'AdditionalDependencies': ['atlsd.lib'],
-          },
-        },
-      },
-      'Release': {
-        'msvs_settings': {
-          'VCLinkerTool': {
-            'AdditionalDependencies': ['atls.lib'],
-          },
-        },
-      },
-    },
   }]
 }