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

Unified Diff: adblockplus.gyp

Issue 6216090891845632: Issue #404 - Create common library shared between plugin/engine and installer (Closed)
Patch Set: final check after rebase Created May 19, 2015, 3:36 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | common/common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: adblockplus.gyp
===================================================================
--- a/adblockplus.gyp
+++ b/adblockplus.gyp
@@ -1,5 +1,8 @@
{
- 'includes': ['defaults.gypi'],
+ 'includes': [
+ 'defaults.gypi',
+ 'common/common.gypi',
+ ],
'variables': {
'build_type%': 'devbuild',
@@ -33,18 +36,17 @@
'targets': [{
'target_name': 'shared',
'type': 'static_library',
+ 'dependencies': [
+ 'common',
+ ],
'sources': [
'src/shared/AutoHandle.cpp',
'src/shared/Communication.cpp',
'src/shared/Dictionary.cpp',
'src/shared/Utils.cpp',
- 'src/shared/Registry.h',
- 'src/shared/Registry.cpp',
- 'src/shared/IE_version.h',
- 'src/shared/IE_version.cpp',
]
},
-
+
{
'target_name': 'AdblockPlusEngine',
'type': 'executable',
@@ -204,7 +206,6 @@
'sources': [
'test/CommunicationTest.cpp',
'test/DictionaryTest.cpp',
- 'test/RegistryTest.cpp',
'test/UtilTest.cpp',
'test/UtilGetQueryStringTest.cpp',
'test/UtilGetSchemeAndHierarchicalPartTest.cpp',
@@ -215,7 +216,7 @@
},
'msvs_settings': {
'VCLinkerTool': {
- 'SubSystem': '1', # Console
+ 'SubSystem': '1', # Console
'EntryPointSymbol': 'mainCRTStartup',
},
},
@@ -266,7 +267,7 @@
},
'msvs_settings': {
'VCLinkerTool': {
- 'SubSystem': '1', # Console
+ 'SubSystem': '1', # Console
'EntryPointSymbol': 'mainCRTStartup',
'conditions': [[
'target_arch=="ia32"', {
« no previous file with comments | « no previous file | common/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld