Side by Side Diff: meson.build
Issue 29594607:
Issue 5143 - Convert ElemHideEmulation to C++ (Closed)
Base URL: https://hg.adblockplus.org/adblockpluscore/
Patch Set: Rebase. Review comments addressed.
Created Jan. 25, 2018, 7:04 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« compiled/ElemHideEmulation.cpp ('K')
|
« lib/elemHideEmulation.js ('k')
|
test/elemHideEmulation.js » ('j')
|
test/elemHideEmulation.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 project('adblockpluscore', 'cpp', license: ['GPL3'], meson_version: '>0.40.0') | 1 project('adblockpluscore', 'cpp', license: ['GPL3'], meson_version: '>0.40.0') |
| 2 | 2 |
| 3 native = get_option('native') | 3 native = get_option('native') |
| 4 if native | 4 if native |
| 5 target_type='native' | 5 target_type='native' |
| 6 else | 6 else |
| 7 target_type='js' | 7 target_type='js' |
| 8 endif | 8 endif |
| 9 | 9 |
| 10 if target_type == 'js' | 10 if target_type == 'js' |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 81 'compiled/filter/ElemHideFilter.cpp', | 81 'compiled/filter/ElemHideFilter.cpp', |
| 82 'compiled/filter/Filter.cpp', | 82 'compiled/filter/Filter.cpp', |
| 83 'compiled/filter/InvalidFilter.cpp', | 83 'compiled/filter/InvalidFilter.cpp', |
| 84 'compiled/filter/RegExpFilter.cpp', | 84 'compiled/filter/RegExpFilter.cpp', |
| 85 'compiled/filter/WhitelistFilter.cpp', | 85 'compiled/filter/WhitelistFilter.cpp', |
| 86 'compiled/storage/FilterStorage.cpp', | 86 'compiled/storage/FilterStorage.cpp', |
| 87 'compiled/subscription/DownloadableSubscription.cpp', | 87 'compiled/subscription/DownloadableSubscription.cpp', |
| 88 'compiled/subscription/Subscription.cpp', | 88 'compiled/subscription/Subscription.cpp', |
| 89 'compiled/subscription/UserDefinedSubscription.cpp', | 89 'compiled/subscription/UserDefinedSubscription.cpp', |
| 90 'compiled/ElemHide.cpp', | 90 'compiled/ElemHide.cpp', |
| 91 'compiled/ElemHideEmulation.cpp', | |
| 91 ] | 92 ] |
| 92 # sources specific to core | 93 # sources specific to core |
| 93 core_sources = [ | 94 core_sources = [ |
| 94 'compiled/traceInit.cpp', | 95 'compiled/traceInit.cpp', |
| 95 ] | 96 ] |
| 96 # sources for the bindings generator | 97 # sources for the bindings generator |
| 97 bindings_sources = [ | 98 bindings_sources = [ |
| 98 'compiled/bindings/generator.cpp', | 99 'compiled/bindings/generator.cpp', |
| 99 'compiled/bindings/main.cpp', | 100 'compiled/bindings/main.cpp', |
| 100 ] | 101 ] |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 191 '--js-library', JS_LIBRARY, | 192 '--js-library', JS_LIBRARY, |
| 192 '@INPUT@' | 193 '@INPUT@' |
| 193 ] + compiler_args + optional_args) | 194 ] + compiler_args + optional_args) |
| 194 else | 195 else |
| 195 adblockpluscore = library('adblockpluscore', shared_sources, | 196 adblockpluscore = library('adblockpluscore', shared_sources, |
| 196 native_sources, | 197 native_sources, |
| 197 cpp_args: ADDITIONAL_PARAMS + CORE_PARAMS, | 198 cpp_args: ADDITIONAL_PARAMS + CORE_PARAMS, |
| 198 link_args: LINK_PARAMS) | 199 link_args: LINK_PARAMS) |
| 199 endif | 200 endif |
| 200 | 201 |
| OLD | NEW |
« compiled/ElemHideEmulation.cpp ('K')
|
« lib/elemHideEmulation.js ('k')
|
test/elemHideEmulation.js » ('j')
|
test/elemHideEmulation.js » ('J')
