[IE] First round of ATL removal

adblockplus.gyp

Index: adblockplus.gyp
===================================================================
--- a/adblockplus.gyp
+++ b/adblockplus.gyp
@@ -72,6 +72,9 @@
       'src/plugin/AdblockPlusClient.cpp',
       'src/plugin/AdblockPlusDomTraverser.cpp',
       'src/plugin/AdblockPlusTab.cpp',
+      'src/plugin/ATL_Deprecate.h',
+	  'src/plugin/COM_Client.cpp',
+	  'src/plugin/COM_Client.h',
       'src/plugin/NotificationMessage.cpp',
       'src/plugin/Plugin.cpp',
       'src/plugin/PluginClass.cpp',
@@ -88,6 +91,8 @@
       'src/plugin/PluginUserSettings.cpp',
       'src/plugin/PluginUtil.cpp',
       'src/plugin/PluginWbPassThrough.cpp',
+	  'src/plugin/Wrapper.h',
+	  'src/plugin/Wrapper.cpp',
       'src/plugin/AdblockPlus.def',
       'src/plugin/AdblockPlus.idl',
       'src/plugin/AdblockPlus.rc',
@@ -157,16 +162,61 @@
     'sources': [
       'test/CommunicationTest.cpp',
       'test/DictionaryTest.cpp',
+	  'test/Util_Test.cpp',
+	  'test/Wrapper_Test.cpp',
+	  'src/plugin/PluginDebug.cpp',
+	  'src/plugin/PluginDebug.h',
+	  'src/plugin/PluginUtil.cpp',
+	  'src/plugin/PluginUtil.h',
+	  'src/plugin/Wrapper.h',
+	  'src/plugin/Wrapper.cpp',
       '<@(shared_files)',
     ],
     'defines': ['WINVER=0x0501'],
+    'include_dirs': [
+      '$(WindowsSDK_IncludePath)',
+      '$(VCInstallDir)atlmfc/include',
+      '$(WINDDKDIR)/inc/atl71',
+    ],
     'link_settings': {
-      'libraries': ['-ladvapi32', '-lshell32', '-lole32'],
+      'libraries': ['-ladvapi32', '-lshell32', '-lole32', '-lShlwapi' ],
+    },
+    'configurations': {
+      # 'libraries' is not allowed under 'configurations' :-(
+      'Debug': {
+        'msvs_settings': {
+          'VCLinkerTool': {
+            'AdditionalDependencies': ['atlsd.lib'],
+          },
+        },
+      },
+      'Release': {
+        'msvs_settings': {
+          'VCLinkerTool': {
+            'AdditionalDependencies': ['atls.lib'],
+          },
+        },
+      },
     },
     'msvs_settings': {
       'VCLinkerTool': {
         'SubSystem': '1',   # Console
         'EntryPointSymbol': 'mainCRTStartup',
+        'conditions': [[
+          'target_arch=="ia32"', {
+            'AdditionalLibraryDirectories': [
+              '$(VCInstallDir)atlmfc/lib',
+              '$(WindowsSDK_LibraryPath_x86)',
+              '$(WINDDKDIR)/lib/ATL/i386',
+            ],
+          }, {
+            'AdditionalLibraryDirectories': [
+              '$(VCInstallDir)atlmfc/lib/amd64',
+              '$(WindowsSDK_LibraryPath_x64)',
+              '$(WINDDKDIR)/lib/ATL/amd64',
+            ],
+          }
+        ]],
       },
     },
   }]