| OLD | NEW | 
|    1 { |    1 { | 
|    2   'includes': ['defaults.gypi'], |    2   'includes': ['defaults.gypi'], | 
|    3  |    3  | 
|    4   'variables': { |    4   'variables': { | 
|    5     'build_type%': 'devbuild', |    5     'build_type%': 'devbuild', | 
|    6     'build_version%': '', |    6     'build_version%': '', | 
|    7   }, |    7   }, | 
|    8  |    8  | 
|    9   'target_defaults': { |    9   'target_defaults': { | 
|   10     'conditions': [ |   10     'conditions': [ | 
| (...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  210     'defines': ['WINVER=0x0501'], |  210     'defines': ['WINVER=0x0501'], | 
|  211     'link_settings': { |  211     'link_settings': { | 
|  212       'libraries': ['-ladvapi32', '-lshell32', '-lole32'], |  212       'libraries': ['-ladvapi32', '-lshell32', '-lole32'], | 
|  213     }, |  213     }, | 
|  214     'msvs_settings': { |  214     'msvs_settings': { | 
|  215       'VCLinkerTool': { |  215       'VCLinkerTool': { | 
|  216         'SubSystem': '1',   # Console |  216         'SubSystem': '1',   # Console | 
|  217         'EntryPointSymbol': 'mainCRTStartup', |  217         'EntryPointSymbol': 'mainCRTStartup', | 
|  218       }, |  218       }, | 
|  219     }, |  219     }, | 
 |  220   }, | 
 |  221  | 
 |  222   { | 
 |  223     'target_name': 'tests_plugin', | 
 |  224     'type': 'executable', | 
 |  225     'dependencies': [ | 
 |  226       'shared', | 
 |  227       'libadblockplus/third_party/googletest.gyp:googletest_main', | 
 |  228     ], | 
 |  229     'sources': [ | 
 |  230       'src/plugin/PluginUserSettings.cpp', | 
 |  231       'src/plugin/PluginUserSettings.h', | 
 |  232       'test/plugin/UserSettingsTest.cpp', | 
 |  233       # | 
 |  234       # required only for linking | 
 |  235       # | 
 |  236       'src/plugin/AdblockPlusClient.cpp', | 
 |  237       'src/plugin/AdblockPlusDomTraverser.cpp', | 
 |  238       'src/plugin/AdblockPlusTab.cpp', | 
 |  239       'src/plugin/ATL_Deprecate.cpp', | 
 |  240       'src/plugin/NotificationMessage.cpp', | 
 |  241       'src/plugin/Plugin.cpp', | 
 |  242       'src/plugin/PluginClientBase.cpp', | 
 |  243       'src/plugin/PluginClientFactory.cpp', | 
 |  244       'src/plugin/PluginClass.cpp', | 
 |  245       'src/plugin/PluginFilter.cpp', | 
 |  246       'src/plugin/PluginMimeFilterClient.cpp', | 
 |  247       'src/plugin/PluginMutex.cpp', | 
 |  248       'src/plugin/PluginSettings.cpp', | 
 |  249       'src/plugin/PluginSystem.cpp', | 
 |  250       'src/plugin/PluginTabBase.cpp', | 
 |  251       'src/plugin/PluginUtil.cpp', | 
 |  252       'src/plugin/PluginWbPassthrough.cpp', | 
 |  253     ], | 
 |  254     'include_dirs': [ | 
 |  255       '$(WINDDKDIR)/inc/atl71', | 
 |  256     ], | 
 |  257     'defines': [ | 
 |  258       'WINVER=0x0501', | 
 |  259       'PRODUCT_ADBLOCKPLUS' | 
 |  260     ], | 
 |  261     'link_settings': { | 
 |  262       'libraries': ['-ladvapi32', '-lshell32', '-lole32', '-lComctl32', '-lGdi32
     '], | 
 |  263     }, | 
 |  264     'msvs_settings': { | 
 |  265       'VCLinkerTool': { | 
 |  266         'SubSystem': '1',   # Console | 
 |  267         'EntryPointSymbol': 'mainCRTStartup', | 
 |  268         'conditions': [[ | 
 |  269           'target_arch=="ia32"', { | 
 |  270             'AdditionalLibraryDirectories': [ | 
 |  271               '$(VCInstallDir)atlmfc/lib', | 
 |  272               '$(WindowsSDK_LibraryPath_x86)', | 
 |  273               '$(WINDDKDIR)/lib/ATL/i386', | 
 |  274             ], | 
 |  275           }, { | 
 |  276             'AdditionalLibraryDirectories': [ | 
 |  277               '$(VCInstallDir)atlmfc/lib/amd64', | 
 |  278               '$(WindowsSDK_LibraryPath_x64)', | 
 |  279               '$(WINDDKDIR)/lib/ATL/amd64', | 
 |  280             ], | 
 |  281           } | 
 |  282         ]], | 
 |  283       }, | 
 |  284     }, | 
 |  285     'configurations': { | 
 |  286       # 'libraries' is not allowed under 'configurations' :-( | 
 |  287       'Debug': { | 
 |  288         'msvs_settings': { | 
 |  289           'VCLinkerTool': { | 
 |  290             'AdditionalDependencies': ['atlsd.lib'], | 
 |  291           }, | 
 |  292         }, | 
 |  293       }, | 
 |  294       'Release': { | 
 |  295         'msvs_settings': { | 
 |  296           'VCLinkerTool': { | 
 |  297             'AdditionalDependencies': ['atls.lib'], | 
 |  298           }, | 
 |  299         }, | 
 |  300       }, | 
 |  301     }, | 
|  220   }] |  302   }] | 
|  221 } |  303 } | 
| OLD | NEW |