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

adblockplus.gyp

Index: adblockplus.gyp
diff --git a/adblockplus.gyp b/adblockplus.gyp
index 9070899b605861baee0b0ce9d409d7a4f8774a2a..b54e2086d80e47cd4b9309b67f83bc7af7211d87 100644
--- a/adblockplus.gyp
+++ b/adblockplus.gyp
@@ -52,7 +52,10 @@
       'src/shared/Version.h',
       'src/shared/MsHTMLUtils.cpp',
       'src/shared/MsHTMLUtils.h',
-      ]
+    ],
+    'include_dirs': [
+      '$(ATLDir)/include',
+    ],
   },
 
   {
@@ -71,6 +74,9 @@
       'src/engine/Updater.cpp',
       'src/engine/engine.rc',
     ],
+    'include_dirs': [
+      '$(ATLDir)/include',
+    ],
     'libraries': [
       '-ladvapi32',
       '-lole32',
@@ -82,6 +88,17 @@
     'msvs_settings': {
       'VCLinkerTool': {
         'DelayLoadDLLs': ['Shell32.dll'],
+        'conditions': [[
+          'target_arch=="ia32"', {
+            'AdditionalLibraryDirectories': [
+              '$(ATLDir)/lib',
+            ],
+          }, {
+            'AdditionalLibraryDirectories': [
+              '$(ATLDir)/lib/amd64',
+            ],
+          }
+        ]],
       },
     },
   },
@@ -151,9 +168,7 @@
       'src/plugin/SinkPolicy.inl',
     ],
     'include_dirs': [
-      '$(WindowsSDK_IncludePath)',
-      '$(VCInstallDir)atlmfc/include',
-      '$(WINDDKDIR)/inc/atl71',
+      '$(ATLDir)/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:
@@ -165,37 +180,16 @@
       '-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',
+              '$(ATLDir)/lib',
             ],
           }, {
             'AdditionalLibraryDirectories': [
-              '$(VCInstallDir)atlmfc/lib/amd64',
-              '$(WindowsSDK_LibraryPath_x64)',
-              '$(WINDDKDIR)/lib/ATL/amd64',
+              '$(ATLDir)/lib/amd64',
             ],
           }
         ]],
@@ -264,7 +258,7 @@
       'src/plugin/PluginWbPassthrough.cpp',
     ],
     'include_dirs': [
-      '$(WINDDKDIR)/inc/atl71',
+      '$(ATLDir)/include',
     ],
     'defines': [
       'WINVER=0x0501',
@@ -280,36 +274,15 @@
         'conditions': [[
           'target_arch=="ia32"', {
             'AdditionalLibraryDirectories': [
-              '$(VCInstallDir)atlmfc/lib',
-              '$(WindowsSDK_LibraryPath_x86)',
-              '$(WINDDKDIR)/lib/ATL/i386',
+              '$(ATLDir)/lib',
             ],
           }, {
             'AdditionalLibraryDirectories': [
-              '$(VCInstallDir)atlmfc/lib/amd64',
-              '$(WindowsSDK_LibraryPath_x64)',
-              '$(WINDDKDIR)/lib/ATL/amd64',
+              '$(ATLDir)/lib/amd64',
             ],
           }
         ]],
       },
     },
-    'configurations': {
-      # 'libraries' is not allowed under 'configurations' :-(
-      'Debug': {
-        'msvs_settings': {
-          'VCLinkerTool': {
-            'AdditionalDependencies': ['atlsd.lib'],
-          },
-        },
-      },
-      'Release': {
-        'msvs_settings': {
-          'VCLinkerTool': {
-            'AdditionalDependencies': ['atls.lib'],
-          },
-        },
-      },
-    },
   }]
 }