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

Side by Side Diff: adblockplus.gyp

Issue 6216090891845632: Issue #404 - Create common library shared between plugin/engine and installer (Closed)
Patch Set: Created Jan. 9, 2015, 8:07 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 | common/common.gypi » ('j') | common/common.gypi » ('J')
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': [
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
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',
38 'src/shared/Communication.cpp', 44 'src/shared/Communication.cpp',
39 'src/shared/Dictionary.cpp', 45 'src/shared/Dictionary.cpp',
40 'src/shared/Utils.cpp', 46 'src/shared/Utils.cpp',
41 'src/shared/Registry.h',
42 'src/shared/Registry.cpp',
43 'src/shared/IE_version.h',
44 'src/shared/IE_version.cpp',
45 ] 47 ]
46 }, 48 },
47 49
48 { 50 {
49 'target_name': 'AdblockPlusEngine', 51 'target_name': 'AdblockPlusEngine',
50 'type': 'executable', 52 'type': 'executable',
51 'dependencies': [ 53 'dependencies': [
52 'shared', 54 'shared',
53 'libadblockplus/libadblockplus.gyp:libadblockplus', 55 'libadblockplus/libadblockplus.gyp:libadblockplus',
54 ], 56 ],
55 'sources': [ 57 'sources': [
56 'src/engine/Main.cpp', 58 'src/engine/Main.cpp',
57 'src/engine/Debug.cpp', 59 'src/engine/Debug.cpp',
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 { 204 {
203 'target_name': 'tests', 205 'target_name': 'tests',
204 'type': 'executable', 206 'type': 'executable',
205 'dependencies': [ 207 'dependencies': [
206 'shared', 208 'shared',
207 'libadblockplus/third_party/googletest.gyp:googletest_main', 209 'libadblockplus/third_party/googletest.gyp:googletest_main',
208 ], 210 ],
209 'sources': [ 211 'sources': [
210 'test/CommunicationTest.cpp', 212 'test/CommunicationTest.cpp',
211 'test/DictionaryTest.cpp', 213 'test/DictionaryTest.cpp',
212 'test/RegistryTest.cpp',
213 ], 214 ],
214 'defines': ['WINVER=0x0501'], 215 'defines': ['WINVER=0x0501'],
215 'link_settings': { 216 'link_settings': {
216 'libraries': ['-ladvapi32', '-lshell32', '-lole32'], 217 'libraries': ['-ladvapi32', '-lshell32', '-lole32'],
217 }, 218 },
218 'msvs_settings': { 219 'msvs_settings': {
219 'VCLinkerTool': { 220 'VCLinkerTool': {
220 'SubSystem': '1', # Console 221 'SubSystem': '1', # Console
221 'EntryPointSymbol': 'mainCRTStartup', 222 'EntryPointSymbol': 'mainCRTStartup',
222 }, 223 },
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 'Release': { 300 'Release': {
300 'msvs_settings': { 301 'msvs_settings': {
301 'VCLinkerTool': { 302 'VCLinkerTool': {
302 'AdditionalDependencies': ['atls.lib'], 303 'AdditionalDependencies': ['atls.lib'],
303 }, 304 },
304 }, 305 },
305 }, 306 },
306 }, 307 },
307 }] 308 }]
308 } 309 }
OLDNEW
« no previous file with comments | « no previous file | common/common.gypi » ('j') | common/common.gypi » ('J')

Powered by Google App Engine
This is Rietveld