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: update to fixed libadblockplus Created Nov. 24, 2014, 11:07 a.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 | « .hgsubstate ('k') | 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 20 matching lines...) Expand all
31 }, 31 },
32 32
33 'targets': [{ 33 'targets': [{
34 'target_name': 'shared', 34 'target_name': 'shared',
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 ] 41 'src/shared/ContentType.h',
42 'src/shared/ContentType.cpp',
43 ],
44 'include_dirs': [
45 'libadblockplus/include',
46 ],
42 }, 47 },
43 48
44 { 49 {
45 'target_name': 'AdblockPlusEngine', 50 'target_name': 'AdblockPlusEngine',
46 'type': 'executable', 51 'type': 'executable',
47 'dependencies': [ 52 'dependencies': [
48 'shared', 53 'shared',
49 'libadblockplus/libadblockplus.gyp:libadblockplus', 54 'libadblockplus/libadblockplus.gyp:libadblockplus',
50 ], 55 ],
51 'sources': [ 56 'sources': [
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 'src/plugin/PluginWbPassThrough.h', 140 'src/plugin/PluginWbPassThrough.h',
136 'src/plugin/ProtocolCF.h', 141 'src/plugin/ProtocolCF.h',
137 'src/plugin/ProtocolCF.inl', 142 'src/plugin/ProtocolCF.inl',
138 'src/plugin/ProtocolImpl.h', 143 'src/plugin/ProtocolImpl.h',
139 'src/plugin/ProtocolImpl.inl', 144 'src/plugin/ProtocolImpl.inl',
140 'src/plugin/Resource.h', 145 'src/plugin/Resource.h',
141 'src/plugin/SinkPolicy.h', 146 'src/plugin/SinkPolicy.h',
142 'src/plugin/SinkPolicy.inl', 147 'src/plugin/SinkPolicy.inl',
143 ], 148 ],
144 'include_dirs': [ 149 'include_dirs': [
150 'libadblockplus/include',
145 '$(WindowsSDK_IncludePath)', 151 '$(WindowsSDK_IncludePath)',
146 '$(VCInstallDir)atlmfc/include', 152 '$(VCInstallDir)atlmfc/include',
147 '$(WINDDKDIR)/inc/atl71', 153 '$(WINDDKDIR)/inc/atl71',
148 ], 154 ],
149 # See "Adding Visual Style Support to an Extension, Plug-in, MMC Snap-in or a DLL 155 # See "Adding Visual Style Support to an Extension, Plug-in, MMC Snap-in or a DLL
150 # That Is Brought into a Process" on the link here: 156 # That Is Brought into a Process" on the link here:
151 # http://msdn.microsoft.com/en-us/library/windows/desktop/bb773175%28v=vs.85 %29.aspx#using_manifests 157 # http://msdn.microsoft.com/en-us/library/windows/desktop/bb773175%28v=vs.85 %29.aspx#using_manifests
152 'defines': ['ISOLATION_AWARE_ENABLED'], 158 'defines': ['ISOLATION_AWARE_ENABLED'],
153 'libraries': [ 159 'libraries': [
154 '-lwinhttp', 160 '-lwinhttp',
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 'libraries': ['-ladvapi32', '-lshell32', '-lole32'], 217 'libraries': ['-ladvapi32', '-lshell32', '-lole32'],
212 }, 218 },
213 'msvs_settings': { 219 'msvs_settings': {
214 'VCLinkerTool': { 220 'VCLinkerTool': {
215 'SubSystem': '1', # Console 221 'SubSystem': '1', # Console
216 'EntryPointSymbol': 'mainCRTStartup', 222 'EntryPointSymbol': 'mainCRTStartup',
217 }, 223 },
218 }, 224 },
219 }] 225 }]
220 } 226 }
OLDNEW
« no previous file with comments | « .hgsubstate ('k') | src/engine/Main.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld