Switch to gyp

adblockplus.gyp

 {
+  'includes': ['defaults.gypi'],
+
   'variables': {
     'build_type%': 'devbuild',
     'build_version%': '',
     'shared_files': [
       'src/shared/AutoHandle.cpp',
       'src/shared/Communication.cpp',
       'src/shared/Dictionary.cpp',
       'src/shared/Utils.cpp',
     ]
   },
 
   'target_defaults': {
-    'configurations': {
-      'Debug': {
-        'defines': [ '_DEBUG' ],
-        'msvs_settings': {
-          'VCCLCompilerTool': {
-            'Optimization': '0',
-
-            'conditions': [
-              ['component=="shared_library"', {
-                'RuntimeLibrary': '3',  # /MDd
-              }, {
-                'RuntimeLibrary': '1',  # /MTd
-              }]
-            ],
-          },
-        },
-      },
-      'Release': {
-        'defines': [ 'NDEBUG' ],
-        'msvs_settings': {
-          'VCCLCompilerTool': {
-            'Optimization': '2',
-            'InlineFunctionExpansion': '2',
-            'EnableIntrinsicFunctions': 'true',
-            'FavorSizeOrSpeed': '0',
-            'StringPooling': 'true',
-            'WholeProgramOptimization': 'true',
-            'EnableFunctionLevelLinking': 'true',
-
-            'conditions': [
-              ['component=="shared_library"', {
-                'RuntimeLibrary': '2',  # /MD
-              }, {
-                'RuntimeLibrary': '0',  # /MT
-              }]
-            ],
-          },
-          'VCLinkerTool': {
-            'EnableCOMDATFolding': 2,   # true
-            'OptimizeReferences': 2,    # true
-          },
-        },
-      },
-    },
-    'defines': ['WIN32', '_WINDOWS'],
-    'msvs_configuration_attributes': {
-      'CharacterSet': '1',  # Unicode
-    },
-    'msvs_settings': {
-      'VCCLCompilerTool': {
-        'WarningLevel': 3,  # Level3
-      },
-      'VCLinkerTool': {
-        'SubSystem': '2',   # Windows
-        'GenerateDebugInformation': 'true',
-      },
-    },
     'conditions': [
       [
         'build_type=="devbuild"',
         {
           'defines': ['ADBLOCK_PLUS_TEST_MODE', 'ADBLOCKPLUS_TEST_MODE'],
         },
         {
           'defines': ['ADBLOCK_PLUS_PRODUCTION_MODE', 'ADBLOCKPLUS_PRODUCTION_MODE'],
         },
       ],
       [
         'build_version!=""',
         {
           'defines': [
-            'IEPLUGIN_VERSION=L"<(version)"',
-            'VERSIONINFO_VERSION=<!(python -c "import sys; print sys.argv[1].replace(\'.\', \',\')" <(version).0)',
-            'VERSIONINFO_VERSION_STR=\\"<(version).0\\"',
+            'IEPLUGIN_VERSION=L"<(build_version)"',
+            'VERSIONINFO_VERSION=<!(python -c "import sys; print sys.argv[1].replace(\'.\', \',\')" <(build_version).0)',
+            'VERSIONINFO_VERSION_STR=\\"<(build_version).0\\"',
           ],
         }
       ],
     ],
   },
 
   'targets': [{
     'target_name': 'AdblockPlusEngine',
     'type': 'executable',
     'dependencies': [
@@ skipping 12 matching lines @@
       '-luser32',
       '-lshell32',
       '-lshlwapi',
     ],
     'msbuild_toolset': 'v110_xp',
     'msvs_settings': {
       'VCLinkerTool': {
         'DelayLoadDLLs': ['Shell32.dll'],
       },
     },
-  }, {
+  },
+
+  {
     'target_name': 'AdblockPlus',
     'type': 'shared_library',
     'sources': [
       'src/plugin/AdblockPlusClient.cpp',
       'src/plugin/AdblockPlusDomTraverser.cpp',
       'src/plugin/AdblockPlusTab.cpp',
       'src/plugin/Plugin.cpp',
       'src/plugin/PluginChecksum.cpp',
       'src/plugin/PluginClass.cpp',
       'src/plugin/PluginClassThread.cpp',
@@ skipping 19 matching lines @@
       'src/plugin/AdblockPlus.idl',
       'src/plugin/AdblockPlus.rc',
       'src/plugin/AdblockPlus.rgs',
       '<@(shared_files)',
     ],
     'include_dirs': [
       '$(WindowsSDK_IncludePath)',
       '$(VCInstallDir)atlmfc/include',
       '$(WINDDKDIR)/inc/atl71',
     ],
-    'library_dirs': [
-      '$(VCInstallDir)atlmfc/lib',
-    ],
     'defines': ['PRODUCT_ADBLOCKPLUS'],
-    'conditions': [
-      [
-        'target_arch=="ia32"', {
-          'library_dirs': [
-            '$(WindowsSDK_LibraryPath_x86)',
-            '$(WINDDKDIR)/lib/ATL/i386',
-          ],
-        }, {
-          'library_dirs': [
-            '$(WindowsSDK_LibraryPath_x64)',
-            '$(WINDDKDIR)/lib/ATL/amd64',
-          ],
-        }
-      ]
-    ],
     'libraries': [
       '-latlthunk',
+      '-lwinhttp',
       '-lshell32',
     ],
+    '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': [
+              '$(WindowsSDK_LibraryPath_x86)',
+              '$(WINDDKDIR)/lib/ATL/i386',
+            ],
+          }, {
+            'AdditionalLibraryDirectories': [
+              '$(WindowsSDK_LibraryPath_x64)',
+              '$(WINDDKDIR)/lib/ATL/amd64',
+            ],
+          }
+        ]],
+        'AdditionalLibraryDirectories': [
+          '$(VCInstallDir)atlmfc/lib',
+        ],
         'DelayLoadDLLs': ['Shell32.dll'],
       },
     },
-  }, {
+  },
+
+  {
     'target_name': 'tests',
     'type': 'executable',
     'dependencies': [
       'libadblockplus/third_party/googletest.gyp:googletest_main',
     ],
     'sources': [
-      '<@(shared_files)',
       'test/CommunicationTest.cpp',
       'test/DictionaryTest.cpp',
+      '<@(shared_files)',
     ],
     'defines': ['WINVER=0x0501'],
     'link_settings': {
       'libraries': ['-ladvapi32', '-lshell32', '-lole32'],
     },
     'msvs_settings': {
       'VCLinkerTool': {
         'SubSystem': '1',   # Console
         'EntryPointSymbol': 'mainCRTStartup',
       },
     },
   }]
 }