| LEFT | RIGHT |
| 1 { | 1 { |
| 2 'includes': ['defaults.gypi'], | 2 'includes': [ |
| 3 'defaults.gypi', |
| 4 'common/common.gypi', |
| 5 ], |
| 3 | 6 |
| 4 'variables': { | 7 'variables': { |
| 5 'build_type%': 'devbuild', | 8 'build_type%': 'devbuild', |
| 6 'build_version%': '', | 9 'build_version%': '', |
| 7 }, | 10 }, |
| 8 | 11 |
| 9 'target_defaults': { | 12 'target_defaults': { |
| 10 'conditions': [ | 13 'conditions': [ |
| 11 [ | 14 [ |
| 12 'build_type=="devbuild"', | 15 'build_type=="devbuild"', |
| (...skipping 13 matching lines...) Expand all Loading... |
| 26 'VERSIONINFO_VERSION_STR=\\"<(build_version).0\\"', | 29 'VERSIONINFO_VERSION_STR=\\"<(build_version).0\\"', |
| 27 ], | 30 ], |
| 28 } | 31 } |
| 29 ], | 32 ], |
| 30 ], | 33 ], |
| 31 }, | 34 }, |
| 32 | 35 |
| 33 'targets': [{ | 36 'targets': [{ |
| 34 'target_name': 'shared', | 37 'target_name': 'shared', |
| 35 'type': 'static_library', | 38 'type': 'static_library', |
| 39 'dependencies': [ |
| 40 'common', |
| 41 ], |
| 36 'sources': [ | 42 'sources': [ |
| 37 'src/shared/AutoHandle.cpp', | 43 'src/shared/AutoHandle.cpp', |
| 44 'src/shared/AutoHandle.h', |
| 38 'src/shared/Communication.cpp', | 45 'src/shared/Communication.cpp', |
| 46 'src/shared/Communication.h', |
| 47 'src/shared/CriticalSection.h', |
| 39 'src/shared/Dictionary.cpp', | 48 'src/shared/Dictionary.cpp', |
| 49 'src/shared/Dictionary.h', |
| 40 'src/shared/Utils.cpp', | 50 'src/shared/Utils.cpp', |
| 41 'src/shared/Registry.h', | 51 'src/shared/Utils.h', |
| 42 'src/shared/Registry.cpp', | 52 'src/shared/Version.h', |
| 43 'src/shared/IE_version.h', | |
| 44 'src/shared/IE_version.cpp', | |
| 45 'src/shared/MsHTMLUtils.cpp', | 53 'src/shared/MsHTMLUtils.cpp', |
| 46 'src/shared/MsHTMLUtils.h', | 54 'src/shared/MsHTMLUtils.h', |
| 47 ] | 55 ] |
| 48 }, | 56 }, |
| 49 | 57 |
| 50 { | 58 { |
| 51 'target_name': 'AdblockPlusEngine', | 59 'target_name': 'AdblockPlusEngine', |
| 52 'type': 'executable', | 60 'type': 'executable', |
| 53 'dependencies': [ | 61 'dependencies': [ |
| 54 'shared', | 62 'shared', |
| 55 'libadblockplus/libadblockplus.gyp:libadblockplus', | 63 'libadblockplus/libadblockplus.gyp:libadblockplus', |
| 56 ], | 64 ], |
| 57 'sources': [ | 65 'sources': [ |
| 58 'src/engine/Main.cpp', | 66 'src/engine/Main.cpp', |
| 59 'src/engine/NotificationWindow.cpp', | 67 'src/engine/NotificationWindow.cpp', |
| (...skipping 30 matching lines...) Expand all Loading... |
| 90 'src/plugin/AdblockPlus.idl', | 98 'src/plugin/AdblockPlus.idl', |
| 91 'src/plugin/AdblockPlus.rc', | 99 'src/plugin/AdblockPlus.rc', |
| 92 'src/plugin/AdblockPlus.rgs', | 100 'src/plugin/AdblockPlus.rgs', |
| 93 'src/plugin/AdblockPlusClient.cpp', | 101 'src/plugin/AdblockPlusClient.cpp', |
| 94 'src/plugin/AdblockPlusClient.h', | 102 'src/plugin/AdblockPlusClient.h', |
| 95 'src/plugin/AdblockPlusDomTraverser.cpp', | 103 'src/plugin/AdblockPlusDomTraverser.cpp', |
| 96 'src/plugin/AdblockPlusDomTraverser.h', | 104 'src/plugin/AdblockPlusDomTraverser.h', |
| 97 'src/plugin/AdblockPlusGuids.h', | 105 'src/plugin/AdblockPlusGuids.h', |
| 98 'src/plugin/ATL_Deprecate.cpp', | 106 'src/plugin/ATL_Deprecate.cpp', |
| 99 'src/plugin/ATL_Deprecate.h', | 107 'src/plugin/ATL_Deprecate.h', |
| 100 'src/plugin/BuildVariant.h', | |
| 101 'src/plugin/Config.h', | 108 'src/plugin/Config.h', |
| 102 'src/plugin/Console.h', | 109 'src/plugin/Console.h', |
| 103 'src/plugin/NotificationMessage.cpp', | 110 'src/plugin/NotificationMessage.cpp', |
| 104 'src/plugin/NotificationMessage.h', | 111 'src/plugin/NotificationMessage.h', |
| 105 'src/plugin/Plugin.cpp', | 112 'src/plugin/Plugin.cpp', |
| 106 'src/plugin/Plugin.h', | 113 'src/plugin/Plugin.h', |
| 107 'src/plugin/PluginClass.cpp', | 114 'src/plugin/PluginClass.cpp', |
| 108 'src/plugin/PluginClass.h', | 115 'src/plugin/PluginClass.h', |
| 109 'src/plugin/PluginClient.h', | |
| 110 'src/plugin/PluginClientBase.cpp', | 116 'src/plugin/PluginClientBase.cpp', |
| 111 'src/plugin/PluginClientBase.h', | 117 'src/plugin/PluginClientBase.h', |
| 112 'src/plugin/PluginClientFactory.cpp', | 118 'src/plugin/PluginClientFactory.cpp', |
| 113 'src/plugin/PluginClientFactory.h', | 119 'src/plugin/PluginClientFactory.h', |
| 114 'src/plugin/PluginDebug.cpp', | 120 'src/plugin/PluginDebug.cpp', |
| 115 'src/plugin/PluginDebug.h', | 121 'src/plugin/PluginDebug.h', |
| 116 'src/plugin/PluginDomTraverserBase.h', | 122 'src/plugin/PluginDomTraverserBase.h', |
| 117 'src/plugin/PluginErrorCodes.h', | 123 'src/plugin/PluginErrorCodes.h', |
| 118 'src/plugin/PluginFilter.cpp', | 124 'src/plugin/PluginFilter.cpp', |
| 119 'src/plugin/PluginFilter.h', | 125 'src/plugin/PluginFilter.h', |
| (...skipping 16 matching lines...) Expand all Loading... |
| 136 'src/plugin/PluginUtil.h', | 142 'src/plugin/PluginUtil.h', |
| 137 'src/plugin/PluginWbPassThrough.cpp', | 143 'src/plugin/PluginWbPassThrough.cpp', |
| 138 'src/plugin/PluginWbPassThrough.h', | 144 'src/plugin/PluginWbPassThrough.h', |
| 139 'src/plugin/ProtocolCF.h', | 145 'src/plugin/ProtocolCF.h', |
| 140 'src/plugin/ProtocolCF.inl', | 146 'src/plugin/ProtocolCF.inl', |
| 141 'src/plugin/ProtocolImpl.h', | 147 'src/plugin/ProtocolImpl.h', |
| 142 'src/plugin/ProtocolImpl.inl', | 148 'src/plugin/ProtocolImpl.inl', |
| 143 'src/plugin/Resource.h', | 149 'src/plugin/Resource.h', |
| 144 'src/plugin/SinkPolicy.h', | 150 'src/plugin/SinkPolicy.h', |
| 145 'src/plugin/SinkPolicy.inl', | 151 'src/plugin/SinkPolicy.inl', |
| 146 'src/plugin/WebBrowserEventsListener.h', | |
| 147 'src/plugin/WebBrowserEventsListener.cpp', | |
| 148 ], | 152 ], |
| 149 'include_dirs': [ | 153 'include_dirs': [ |
| 150 '$(WindowsSDK_IncludePath)', | 154 '$(WindowsSDK_IncludePath)', |
| 151 '$(VCInstallDir)atlmfc/include', | 155 '$(VCInstallDir)atlmfc/include', |
| 152 '$(WINDDKDIR)/inc/atl71', | 156 '$(WINDDKDIR)/inc/atl71', |
| 153 ], | 157 ], |
| 154 # See "Adding Visual Style Support to an Extension, Plug-in, MMC Snap-in or
a DLL | 158 # See "Adding Visual Style Support to an Extension, Plug-in, MMC Snap-in or
a DLL |
| 155 # That Is Brought into a Process" on the link here: | 159 # That Is Brought into a Process" on the link here: |
| 156 # http://msdn.microsoft.com/en-us/library/windows/desktop/bb773175%28v=vs.85
%29.aspx#using_manifests | 160 # http://msdn.microsoft.com/en-us/library/windows/desktop/bb773175%28v=vs.85
%29.aspx#using_manifests |
| 157 'defines': ['ISOLATION_AWARE_ENABLED'], | 161 'defines': ['ISOLATION_AWARE_ENABLED'], |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 203 { | 207 { |
| 204 'target_name': 'tests', | 208 'target_name': 'tests', |
| 205 'type': 'executable', | 209 'type': 'executable', |
| 206 'dependencies': [ | 210 'dependencies': [ |
| 207 'shared', | 211 'shared', |
| 208 'libadblockplus/third_party/googletest.gyp:googletest_main', | 212 'libadblockplus/third_party/googletest.gyp:googletest_main', |
| 209 ], | 213 ], |
| 210 'sources': [ | 214 'sources': [ |
| 211 'test/CommunicationTest.cpp', | 215 'test/CommunicationTest.cpp', |
| 212 'test/DictionaryTest.cpp', | 216 'test/DictionaryTest.cpp', |
| 213 'test/RegistryTest.cpp', | |
| 214 'test/UtilTest.cpp', | 217 'test/UtilTest.cpp', |
| 218 'test/UtilGetQueryStringTest.cpp', |
| 219 'test/UtilGetSchemeAndHierarchicalPartTest.cpp', |
| 215 ], | 220 ], |
| 216 'defines': ['WINVER=0x0501'], | 221 'defines': ['WINVER=0x0501'], |
| 217 'link_settings': { | 222 'link_settings': { |
| 218 'libraries': ['-ladvapi32', '-lshell32', '-lole32'], | 223 'libraries': ['-ladvapi32', '-lshell32', '-lole32'], |
| 219 }, | 224 }, |
| 220 'msvs_settings': { | 225 'msvs_settings': { |
| 221 'VCLinkerTool': { | 226 'VCLinkerTool': { |
| 222 'SubSystem': '1', # Console | 227 'SubSystem': '1', # Console |
| 223 'EntryPointSymbol': 'mainCRTStartup', | 228 'EntryPointSymbol': 'mainCRTStartup', |
| 224 }, | 229 }, |
| 225 }, | 230 }, |
| 226 }, | 231 }, |
| 227 | 232 |
| 228 { | 233 { |
| 229 'target_name': 'tests_plugin', | 234 'target_name': 'tests_plugin', |
| 230 'type': 'executable', | 235 'type': 'executable', |
| 231 'dependencies': [ | 236 'dependencies': [ |
| 232 'shared', | 237 'shared', |
| (...skipping 17 matching lines...) Expand all Loading... |
| 250 'src/plugin/PluginClass.cpp', | 255 'src/plugin/PluginClass.cpp', |
| 251 'src/plugin/PluginDebug.cpp', | 256 'src/plugin/PluginDebug.cpp', |
| 252 'src/plugin/PluginFilter.cpp', | 257 'src/plugin/PluginFilter.cpp', |
| 253 'src/plugin/PluginMimeFilterClient.cpp', | 258 'src/plugin/PluginMimeFilterClient.cpp', |
| 254 'src/plugin/PluginMutex.cpp', | 259 'src/plugin/PluginMutex.cpp', |
| 255 'src/plugin/PluginSettings.cpp', | 260 'src/plugin/PluginSettings.cpp', |
| 256 'src/plugin/PluginSystem.cpp', | 261 'src/plugin/PluginSystem.cpp', |
| 257 'src/plugin/PluginTabBase.cpp', | 262 'src/plugin/PluginTabBase.cpp', |
| 258 'src/plugin/PluginUtil.cpp', | 263 'src/plugin/PluginUtil.cpp', |
| 259 'src/plugin/PluginWbPassthrough.cpp', | 264 'src/plugin/PluginWbPassthrough.cpp', |
| 260 'src/plugin/WebBrowserEventsListener.h', | |
| 261 'src/plugin/WebBrowserEventsListener.cpp', | |
| 262 ], | 265 ], |
| 263 'include_dirs': [ | 266 'include_dirs': [ |
| 264 '$(WINDDKDIR)/inc/atl71', | 267 '$(WINDDKDIR)/inc/atl71', |
| 265 ], | 268 ], |
| 266 'defines': [ | 269 'defines': [ |
| 267 'WINVER=0x0501', | 270 'WINVER=0x0501', |
| 268 'PRODUCT_ADBLOCKPLUS' | 271 'PRODUCT_ADBLOCKPLUS' |
| 269 ], | 272 ], |
| 270 'link_settings': { | 273 'link_settings': { |
| 271 'libraries': ['-ladvapi32', '-lshell32', '-lole32', '-lComctl32', '-lGdi32
'], | 274 'libraries': ['-ladvapi32', '-lshell32', '-lole32', '-lComctl32', '-lGdi32
'], |
| 272 }, | 275 }, |
| 273 'msvs_settings': { | 276 'msvs_settings': { |
| 274 'VCLinkerTool': { | 277 'VCLinkerTool': { |
| 275 'SubSystem': '1', # Console | 278 'SubSystem': '1', # Console |
| 276 'EntryPointSymbol': 'mainCRTStartup', | 279 'EntryPointSymbol': 'mainCRTStartup', |
| 277 'conditions': [[ | 280 'conditions': [[ |
| 278 'target_arch=="ia32"', { | 281 'target_arch=="ia32"', { |
| 279 'AdditionalLibraryDirectories': [ | 282 'AdditionalLibraryDirectories': [ |
| 280 '$(VCInstallDir)atlmfc/lib', | 283 '$(VCInstallDir)atlmfc/lib', |
| 281 '$(WindowsSDK_LibraryPath_x86)', | 284 '$(WindowsSDK_LibraryPath_x86)', |
| 282 '$(WINDDKDIR)/lib/ATL/i386', | 285 '$(WINDDKDIR)/lib/ATL/i386', |
| 283 ], | 286 ], |
| 284 }, { | 287 }, { |
| 285 'AdditionalLibraryDirectories': [ | 288 'AdditionalLibraryDirectories': [ |
| (...skipping 17 matching lines...) Expand all Loading... |
| 303 'Release': { | 306 'Release': { |
| 304 'msvs_settings': { | 307 'msvs_settings': { |
| 305 'VCLinkerTool': { | 308 'VCLinkerTool': { |
| 306 'AdditionalDependencies': ['atls.lib'], | 309 'AdditionalDependencies': ['atls.lib'], |
| 307 }, | 310 }, |
| 308 }, | 311 }, |
| 309 }, | 312 }, |
| 310 }, | 313 }, |
| 311 }] | 314 }] |
| 312 } | 315 } |
| LEFT | RIGHT |