Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: adblockplus.gyp

Issue 5316782940225536: Issue 1557 - Update to the recent libadblockplus to reduce additional updates in the logic later. (Closed)
Patch Set: only rebase Created Jan. 28, 2015, 1:20 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | src/engine/Main.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 24 matching lines...) Expand all
35 'type': 'static_library', 35 'type': 'static_library',
36 'sources': [ 36 'sources': [
37 'src/shared/AutoHandle.cpp', 37 'src/shared/AutoHandle.cpp',
38 'src/shared/Communication.cpp', 38 'src/shared/Communication.cpp',
39 'src/shared/Dictionary.cpp', 39 'src/shared/Dictionary.cpp',
40 'src/shared/Utils.cpp', 40 'src/shared/Utils.cpp',
41 'src/shared/Registry.h', 41 'src/shared/Registry.h',
42 'src/shared/Registry.cpp', 42 'src/shared/Registry.cpp',
43 'src/shared/IE_version.h', 43 'src/shared/IE_version.h',
44 'src/shared/IE_version.cpp', 44 'src/shared/IE_version.cpp',
45 ] 45 'src/shared/ContentType.h',
46 'src/shared/ContentType.cpp',
47 ],
48 'include_dirs': [
49 'libadblockplus/include',
50 ],
46 }, 51 },
47 52
48 { 53 {
49 'target_name': 'AdblockPlusEngine', 54 'target_name': 'AdblockPlusEngine',
50 'type': 'executable', 55 'type': 'executable',
51 'dependencies': [ 56 'dependencies': [
52 'shared', 57 'shared',
53 'libadblockplus/libadblockplus.gyp:libadblockplus', 58 'libadblockplus/libadblockplus.gyp:libadblockplus',
54 ], 59 ],
55 'sources': [ 60 'sources': [
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 'src/plugin/PluginWbPassThrough.h', 144 'src/plugin/PluginWbPassThrough.h',
140 'src/plugin/ProtocolCF.h', 145 'src/plugin/ProtocolCF.h',
141 'src/plugin/ProtocolCF.inl', 146 'src/plugin/ProtocolCF.inl',
142 'src/plugin/ProtocolImpl.h', 147 'src/plugin/ProtocolImpl.h',
143 'src/plugin/ProtocolImpl.inl', 148 'src/plugin/ProtocolImpl.inl',
144 'src/plugin/Resource.h', 149 'src/plugin/Resource.h',
145 'src/plugin/SinkPolicy.h', 150 'src/plugin/SinkPolicy.h',
146 'src/plugin/SinkPolicy.inl', 151 'src/plugin/SinkPolicy.inl',
147 ], 152 ],
148 'include_dirs': [ 153 'include_dirs': [
154 'libadblockplus/include',
149 '$(WindowsSDK_IncludePath)', 155 '$(WindowsSDK_IncludePath)',
150 '$(VCInstallDir)atlmfc/include', 156 '$(VCInstallDir)atlmfc/include',
151 '$(WINDDKDIR)/inc/atl71', 157 '$(WINDDKDIR)/inc/atl71',
152 ], 158 ],
153 # See "Adding Visual Style Support to an Extension, Plug-in, MMC Snap-in or a DLL 159 # See "Adding Visual Style Support to an Extension, Plug-in, MMC Snap-in or a DLL
154 # That Is Brought into a Process" on the link here: 160 # That Is Brought into a Process" on the link here:
155 # http://msdn.microsoft.com/en-us/library/windows/desktop/bb773175%28v=vs.85 %29.aspx#using_manifests 161 # http://msdn.microsoft.com/en-us/library/windows/desktop/bb773175%28v=vs.85 %29.aspx#using_manifests
156 'defines': ['ISOLATION_AWARE_ENABLED'], 162 'defines': ['ISOLATION_AWARE_ENABLED'],
157 'libraries': [ 163 'libraries': [
158 '-lwinhttp', 164 '-lwinhttp',
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 'src/plugin/PluginFilter.cpp', 256 'src/plugin/PluginFilter.cpp',
251 'src/plugin/PluginMimeFilterClient.cpp', 257 'src/plugin/PluginMimeFilterClient.cpp',
252 'src/plugin/PluginMutex.cpp', 258 'src/plugin/PluginMutex.cpp',
253 'src/plugin/PluginSettings.cpp', 259 'src/plugin/PluginSettings.cpp',
254 'src/plugin/PluginSystem.cpp', 260 'src/plugin/PluginSystem.cpp',
255 'src/plugin/PluginTabBase.cpp', 261 'src/plugin/PluginTabBase.cpp',
256 'src/plugin/PluginUtil.cpp', 262 'src/plugin/PluginUtil.cpp',
257 'src/plugin/PluginWbPassthrough.cpp', 263 'src/plugin/PluginWbPassthrough.cpp',
258 ], 264 ],
259 'include_dirs': [ 265 'include_dirs': [
266 'libadblockplus/include',
260 '$(WINDDKDIR)/inc/atl71', 267 '$(WINDDKDIR)/inc/atl71',
261 ], 268 ],
262 'defines': [ 269 'defines': [
263 'WINVER=0x0501', 270 'WINVER=0x0501',
264 'PRODUCT_ADBLOCKPLUS' 271 'PRODUCT_ADBLOCKPLUS'
265 ], 272 ],
266 'link_settings': { 273 'link_settings': {
267 'libraries': ['-ladvapi32', '-lshell32', '-lole32', '-lComctl32', '-lGdi32 '], 274 'libraries': ['-ladvapi32', '-lshell32', '-lole32', '-lComctl32', '-lGdi32 '],
268 }, 275 },
269 'msvs_settings': { 276 'msvs_settings': {
(...skipping 29 matching lines...) Expand all
299 'Release': { 306 'Release': {
300 'msvs_settings': { 307 'msvs_settings': {
301 'VCLinkerTool': { 308 'VCLinkerTool': {
302 'AdditionalDependencies': ['atls.lib'], 309 'AdditionalDependencies': ['atls.lib'],
303 }, 310 },
304 }, 311 },
305 }, 312 },
306 }, 313 },
307 }] 314 }]
308 } 315 }
OLDNEW
« no previous file with comments | « no previous file | src/engine/Main.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld