OLD | NEW |
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 Loading... |
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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
197 { | 199 { |
198 'target_name': 'tests', | 200 'target_name': 'tests', |
199 'type': 'executable', | 201 'type': 'executable', |
200 'dependencies': [ | 202 'dependencies': [ |
201 'shared', | 203 'shared', |
202 'libadblockplus/third_party/googletest.gyp:googletest_main', | 204 'libadblockplus/third_party/googletest.gyp:googletest_main', |
203 ], | 205 ], |
204 'sources': [ | 206 'sources': [ |
205 'test/CommunicationTest.cpp', | 207 'test/CommunicationTest.cpp', |
206 'test/DictionaryTest.cpp', | 208 'test/DictionaryTest.cpp', |
207 'test/RegistryTest.cpp', | |
208 'test/UtilTest.cpp', | 209 'test/UtilTest.cpp', |
209 'test/UtilGetQueryStringTest.cpp', | 210 'test/UtilGetQueryStringTest.cpp', |
210 'test/UtilGetSchemeAndHierarchicalPartTest.cpp', | 211 'test/UtilGetSchemeAndHierarchicalPartTest.cpp', |
211 ], | 212 ], |
212 'defines': ['WINVER=0x0501'], | 213 'defines': ['WINVER=0x0501'], |
213 'link_settings': { | 214 'link_settings': { |
214 'libraries': ['-ladvapi32', '-lshell32', '-lole32'], | 215 'libraries': ['-ladvapi32', '-lshell32', '-lole32'], |
215 }, | 216 }, |
216 'msvs_settings': { | 217 'msvs_settings': { |
217 'VCLinkerTool': { | 218 'VCLinkerTool': { |
218 'SubSystem': '1', # Console | 219 'SubSystem': '1', # Console |
219 'EntryPointSymbol': 'mainCRTStartup', | 220 'EntryPointSymbol': 'mainCRTStartup', |
220 }, | 221 }, |
221 }, | 222 }, |
222 }, | 223 }, |
223 | 224 |
224 { | 225 { |
225 'target_name': 'tests_plugin', | 226 'target_name': 'tests_plugin', |
226 'type': 'executable', | 227 'type': 'executable', |
227 'dependencies': [ | 228 'dependencies': [ |
228 'shared', | 229 'shared', |
(...skipping 30 matching lines...) Expand all Loading... |
259 ], | 260 ], |
260 'defines': [ | 261 'defines': [ |
261 'WINVER=0x0501', | 262 'WINVER=0x0501', |
262 'PRODUCT_ADBLOCKPLUS' | 263 'PRODUCT_ADBLOCKPLUS' |
263 ], | 264 ], |
264 'link_settings': { | 265 'link_settings': { |
265 'libraries': ['-ladvapi32', '-lshell32', '-lole32', '-lComctl32', '-lGdi32
'], | 266 'libraries': ['-ladvapi32', '-lshell32', '-lole32', '-lComctl32', '-lGdi32
'], |
266 }, | 267 }, |
267 'msvs_settings': { | 268 'msvs_settings': { |
268 'VCLinkerTool': { | 269 'VCLinkerTool': { |
269 'SubSystem': '1', # Console | 270 'SubSystem': '1', # Console |
270 'EntryPointSymbol': 'mainCRTStartup', | 271 'EntryPointSymbol': 'mainCRTStartup', |
271 'conditions': [[ | 272 'conditions': [[ |
272 'target_arch=="ia32"', { | 273 'target_arch=="ia32"', { |
273 'AdditionalLibraryDirectories': [ | 274 'AdditionalLibraryDirectories': [ |
274 '$(VCInstallDir)atlmfc/lib', | 275 '$(VCInstallDir)atlmfc/lib', |
275 '$(WindowsSDK_LibraryPath_x86)', | 276 '$(WindowsSDK_LibraryPath_x86)', |
276 '$(WINDDKDIR)/lib/ATL/i386', | 277 '$(WINDDKDIR)/lib/ATL/i386', |
277 ], | 278 ], |
278 }, { | 279 }, { |
279 'AdditionalLibraryDirectories': [ | 280 'AdditionalLibraryDirectories': [ |
(...skipping 17 matching lines...) Expand all Loading... |
297 'Release': { | 298 'Release': { |
298 'msvs_settings': { | 299 'msvs_settings': { |
299 'VCLinkerTool': { | 300 'VCLinkerTool': { |
300 'AdditionalDependencies': ['atls.lib'], | 301 'AdditionalDependencies': ['atls.lib'], |
301 }, | 302 }, |
302 }, | 303 }, |
303 }, | 304 }, |
304 }, | 305 }, |
305 }] | 306 }] |
306 } | 307 } |
OLD | NEW |