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

Delta Between Two Patch Sets: adblockplus.gyp

Issue 5316782940225536: Issue 1557 - Update to the recent libadblockplus to reduce additional updates in the logic later. (Closed)
Left Patch Set: link addon with libadblockplus Created Jan. 29, 2015, 4:05 p.m.
Right Patch Set: rebase and remove member of CFilter Created Feb. 4, 2015, 12:50 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « .hgsubstate ('k') | src/engine/Main.cpp » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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 'src/shared/ContentType.h', 45 ]
46 'src/shared/ContentType.cpp',
47 ],
48 'include_dirs': [
49 'libadblockplus/include',
50 ],
51 }, 46 },
52 47
53 { 48 {
54 'target_name': 'AdblockPlusEngine', 49 'target_name': 'AdblockPlusEngine',
55 'type': 'executable', 50 'type': 'executable',
56 'dependencies': [ 51 'dependencies': [
57 'shared', 52 'shared',
58 'libadblockplus/libadblockplus.gyp:libadblockplus', 53 'libadblockplus/libadblockplus.gyp:libadblockplus',
59 ], 54 ],
60 'sources': [ 55 'sources': [
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 'target_name': 'tests', 204 'target_name': 'tests',
210 'type': 'executable', 205 'type': 'executable',
211 'dependencies': [ 206 'dependencies': [
212 'shared', 207 'shared',
213 'libadblockplus/third_party/googletest.gyp:googletest_main', 208 'libadblockplus/third_party/googletest.gyp:googletest_main',
214 ], 209 ],
215 'sources': [ 210 'sources': [
216 'test/CommunicationTest.cpp', 211 'test/CommunicationTest.cpp',
217 'test/DictionaryTest.cpp', 212 'test/DictionaryTest.cpp',
218 'test/RegistryTest.cpp', 213 'test/RegistryTest.cpp',
214 'test/UtilTest.cpp',
219 ], 215 ],
220 'defines': ['WINVER=0x0501'], 216 'defines': ['WINVER=0x0501'],
221 'link_settings': { 217 'link_settings': {
222 'libraries': ['-ladvapi32', '-lshell32', '-lole32'], 218 'libraries': ['-ladvapi32', '-lshell32', '-lole32'],
223 }, 219 },
224 'msvs_settings': { 220 'msvs_settings': {
225 'VCLinkerTool': { 221 'VCLinkerTool': {
226 'SubSystem': '1', # Console 222 'SubSystem': '1', # Console
227 'EntryPointSymbol': 'mainCRTStartup', 223 'EntryPointSymbol': 'mainCRTStartup',
228 }, 224 },
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 'Release': { 302 'Release': {
307 'msvs_settings': { 303 'msvs_settings': {
308 'VCLinkerTool': { 304 'VCLinkerTool': {
309 'AdditionalDependencies': ['atls.lib'], 305 'AdditionalDependencies': ['atls.lib'],
310 }, 306 },
311 }, 307 },
312 }, 308 },
313 }, 309 },
314 }] 310 }]
315 } 311 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld