LEFT | RIGHT |
1 { | 1 { |
2 'conditions': [[ | 2 'conditions': [[ |
3 # We don't want to use curl on Windows and Android, skip the check there | 3 # We don't want to use curl on Windows and Android, skip the check there |
4 'OS=="win" or OS=="android"', | 4 'OS=="win" or OS=="android"', |
5 { | 5 { |
6 'variables': { | 6 'variables': { |
7 'have_curl': 0 | 7 'have_curl': 0 |
8 } | 8 } |
9 }, | 9 }, |
10 { | 10 { |
(...skipping 19 matching lines...) Expand all Loading... |
30 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_libbase.lib'
, | 30 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_libbase.lib'
, |
31 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_libsampler.l
ib', | 31 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_libsampler.l
ib', |
32 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_snapshot.lib
', | 32 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_snapshot.lib
', |
33 ], | 33 ], |
34 'action': [ | 34 'action': [ |
35 'cmd', | 35 'cmd', |
36 '/C', | 36 '/C', |
37 'build-v8.cmd', | 37 'build-v8.cmd', |
38 '$(MSBuildBinPath)', | 38 '$(MSBuildBinPath)', |
39 '<(target_arch)', | 39 '<(target_arch)', |
40 '<(CONFIGURATION_NAME)' | 40 '<(CONFIGURATION_NAME)', |
| 41 '$(PlatformToolset)' |
41 ] | 42 ] |
42 }], | 43 }], |
43 }] | 44 }] |
44 } | 45 } |
45 ]], | 46 ]], |
46 'includes': ['shell/shell.gyp'], | 47 'includes': ['shell/shell.gyp'], |
47 'targets': [{ | 48 'targets': [{ |
48 'target_name': 'libadblockplus', | 49 'target_name': 'libadblockplus', |
49 'type': '<(library)', | 50 'type': '<(library)', |
50 'xcode_settings':{}, | 51 'xcode_settings':{}, |
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
210 '--convert', '<@(library_files)', | 211 '--convert', '<@(library_files)', |
211 '--after', '<@(load_after_files)', | 212 '--after', '<@(load_after_files)', |
212 ] | 213 ] |
213 }] | 214 }] |
214 }, | 215 }, |
215 { | 216 { |
216 'target_name': 'tests', | 217 'target_name': 'tests', |
217 'type': 'executable', | 218 'type': 'executable', |
218 'xcode_settings': {}, | 219 'xcode_settings': {}, |
219 'dependencies': [ | 220 'dependencies': [ |
220 'third_party/googletest.gyp:googletest_main', | 221 'googletest.gyp:googletest_main', |
221 'libadblockplus' | 222 'libadblockplus' |
222 ], | 223 ], |
223 'sources': [ | 224 'sources': [ |
224 'test/BaseJsTest.h', | 225 'test/BaseJsTest.h', |
225 'test/BaseJsTest.cpp', | 226 'test/BaseJsTest.cpp', |
226 'test/AppInfoJsObject.cpp', | 227 'test/AppInfoJsObject.cpp', |
227 'test/ConsoleJsObject.cpp', | 228 'test/ConsoleJsObject.cpp', |
228 'test/DefaultFileSystem.cpp', | 229 'test/DefaultFileSystem.cpp', |
229 'test/FileSystemJsObject.cpp', | 230 'test/FileSystemJsObject.cpp', |
230 'test/FilterEngine.cpp', | 231 'test/FilterEngine.cpp', |
231 'test/GlobalJsObject.cpp', | 232 'test/GlobalJsObject.cpp', |
232 'test/JsEngine.cpp', | 233 'test/JsEngine.cpp', |
233 'test/JsValue.cpp', | 234 'test/JsValue.cpp', |
234 'test/Notification.cpp', | 235 'test/Notification.cpp', |
235 'test/Prefs.cpp', | 236 'test/Prefs.cpp', |
236 'test/ReferrerMapping.cpp', | 237 'test/ReferrerMapping.cpp', |
237 'test/Thread.cpp', | 238 'test/Thread.cpp', |
238 'test/UpdateCheck.cpp', | 239 'test/UpdateCheck.cpp', |
239 'test/WebRequest.cpp' | 240 'test/WebRequest.cpp' |
240 ], | 241 ], |
241 'msvs_settings': { | 242 'msvs_settings': { |
242 'VCLinkerTool': { | 243 'VCLinkerTool': { |
243 'SubSystem': '1', # Console | 244 'SubSystem': '1', # Console |
244 'EntryPointSymbol': 'mainCRTStartup', | 245 'EntryPointSymbol': 'mainCRTStartup', |
245 }, | 246 }, |
246 }, | 247 }, |
247 }] | 248 }] |
248 } | 249 } |
LEFT | RIGHT |