Left: | ||
Right: |
OLD | NEW |
---|---|
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 { |
11 'variables': { | 11 'variables': { |
12 'have_curl': '<!(python check_curl.py)' | 12 'have_curl': '<!(python check_curl.py)' |
13 } | 13 } |
14 } | 14 } |
15 ]], | 15 ]], |
16 'includes': ['third_party/v8/build/features.gypi', | 16 'includes': ['third_party/v8/build/features.gypi', |
17 'third_party/v8/build/toolchain.gypi', | 17 'third_party/v8/build/toolchain.gypi', |
18 'shell/shell.gyp'], | 18 'shell/shell.gyp'], |
19 'targets': [{ | 19 'targets': [{ |
20 'target_name': 'libadblockplus', | 20 'target_name': 'libadblockplus', |
21 'type': '<(library)', | 21 'type': '<(library)', |
22 'direct_dependent_settings':{ | |
Felix Dahlke
2015/01/13 16:51:51
There already is a direct_dependent_settings secti
| |
23 'defines': [ | |
24 'werror', | |
Felix Dahlke
2015/01/13 16:51:51
What exactly is this supposed to do? How I underst
| |
25 ], | |
26 'include_dirs': [ | |
27 'third_party/v8/include', | |
Felix Dahlke
2015/01/13 16:51:51
This adds the v8 include path to all projects usin
| |
28 ], | |
29 }, | |
22 'include_dirs': [ | 30 'include_dirs': [ |
23 'include', | 31 'include', |
Felix Dahlke
2015/01/13 16:51:51
Let's stick to two space indents pleasee.
| |
24 'third_party/v8/include', | |
25 ], | 32 ], |
26 'sources': [ | 33 'sources': [ |
27 'src/AppInfoJsObject.cpp', | 34 'src/AppInfoJsObject.cpp', |
28 'src/ConsoleJsObject.cpp', | 35 'src/ConsoleJsObject.cpp', |
29 'src/DefaultLogSystem.cpp', | 36 'src/DefaultLogSystem.cpp', |
30 'src/DefaultFileSystem.cpp', | 37 'src/DefaultFileSystem.cpp', |
31 'src/FileSystemJsObject.cpp', | 38 'src/FileSystemJsObject.cpp', |
32 'src/FilterEngine.cpp', | 39 'src/FilterEngine.cpp', |
33 'src/GlobalJsObject.cpp', | 40 'src/GlobalJsObject.cpp', |
34 'src/JsContext.cpp', | 41 'src/JsContext.cpp', |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
166 'VCLinkerTool': { | 173 'VCLinkerTool': { |
167 'SubSystem': '1', # Console | 174 'SubSystem': '1', # Console |
168 'EntryPointSymbol': 'mainCRTStartup', | 175 'EntryPointSymbol': 'mainCRTStartup', |
169 }, | 176 }, |
170 }, | 177 }, |
171 'xcode_settings': { | 178 'xcode_settings': { |
172 'OTHER_LDFLAGS': ['-stdlib=libstdc++'], | 179 'OTHER_LDFLAGS': ['-stdlib=libstdc++'], |
173 }, | 180 }, |
174 }] | 181 }] |
175 } | 182 } |
OLD | NEW |