Delta Between Two Patch Sets: meson.build
Issue 29661608:
Issue 6241 - Allow a native build. (Closed)
Base URL: https://hg.adblockplus.org/adblockpluscore/
Left Patch Set:
Created Jan. 10, 2018, 9:26 p.m.
Right Patch Set: addressed comments
Created Jan. 11, 2018, 8:40 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« compiled/library.cpp ('K')
|
« compiled/library.cpp ('k')
|
meson_options.txt » ('j')
|
no next file with change/comment »
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')
| LEFT | RIGHT |
|---|---|
| 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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 97 'compiled/traceInit.cpp', | 97 'compiled/traceInit.cpp', |
| 98 ] | 98 ] |
| 99 # sources for the bindings generator | 99 # sources for the bindings generator |
| 100 bindings_sources = [ | 100 bindings_sources = [ |
| 101 'compiled/bindings/generator.cpp', | 101 'compiled/bindings/generator.cpp', |
| 102 'compiled/bindings/main.cpp', | 102 'compiled/bindings/main.cpp', |
| 103 ] | 103 ] |
| 104 # native sources | 104 # native sources |
| 105 native_sources = [ | 105 native_sources = [ |
| 106 'compiled/library.cpp', | 106 'compiled/library.cpp', |
| 107 'compiled/Utils.cpp', | |
| 107 ] | 108 ] |
| 108 | 109 |
| 109 defines_args = [] | 110 defines_args = [] |
| 110 foreach define : DEFINES | 111 foreach define : DEFINES |
| 111 defines_args += '-D' + define | 112 defines_args += '-D' + define |
| 112 endforeach | 113 endforeach |
| 113 | 114 |
| 114 generation_args = [] | 115 generation_args = [] |
| 115 foreach param : GENERATION_PARAMS | 116 foreach param : GENERATION_PARAMS |
| 116 generation_args += '-s' | 117 generation_args += '-s' |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 193 '--js-library', JS_LIBRARY, | 194 '--js-library', JS_LIBRARY, |
| 194 '@INPUT@' | 195 '@INPUT@' |
| 195 ] + compiler_args + optional_args) | 196 ] + compiler_args + optional_args) |
| 196 else | 197 else |
| 197 adblockpluscore = library('adblockpluscore', shared_sources, | 198 adblockpluscore = library('adblockpluscore', shared_sources, |
| 198 native_sources, | 199 native_sources, |
| 199 cpp_args: ADDITIONAL_PARAMS + CORE_PARAMS, | 200 cpp_args: ADDITIONAL_PARAMS + CORE_PARAMS, |
| 200 link_args: LINK_PARAMS) | 201 link_args: LINK_PARAMS) |
| 201 endif | 202 endif |
| 202 | 203 |
| LEFT | RIGHT |
« compiled/library.cpp ('k')
|
meson_options.txt » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
