Side by Side Diff: meson.build
Issue 29690843:
Issue 6359 - use C++14 instead of C++1z (Closed)
Base URL: github.com:adblockplus/adblockpluscore
Patch Set: support more compilers
Created Feb. 6, 2018, 10:32 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« compiled/bindings/generator.cpp ('k')
|
no next file »
|
no next file with comments »
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 22 matching lines...) Expand all Loading... | |
| 33 endif | 33 endif |
| 34 nodejs = find_program(command.stdout().strip(), 'node', 'nodejs') | 34 nodejs = find_program(command.stdout().strip(), 'node', 'nodejs') |
| 35 endif | 35 endif |
| 36 | 36 |
| 37 JS_LIBRARY = files(join_paths('compiled', 'library.js')) | 37 JS_LIBRARY = files(join_paths('compiled', 'library.js')) |
| 38 BINDINGS_JS_LIBRARY = files(join_paths('compiled', 'bindings', 'library.js')) | 38 BINDINGS_JS_LIBRARY = files(join_paths('compiled', 'bindings', 'library.js')) |
| 39 BINDINGS_GENERATOR = 'bindings.cpp.js' | 39 BINDINGS_GENERATOR = 'bindings.cpp.js' |
| 40 BINDINGS_OUTPUT = 'bindings.js' | 40 BINDINGS_OUTPUT = 'bindings.js' |
| 41 COMPILER_OUTPUT = 'compiled.js' | 41 COMPILER_OUTPUT = 'compiled.js' |
| 42 # params for emcc compilation | 42 # params for emcc compilation |
| 43 ADDITIONAL_PARAMS = [ '-O3', '-std=c++1z', '-Wall', '-Werror', | 43 ADDITIONAL_PARAMS = [ '-O3', '-std=c++14', '-Wall', '-Werror', |
| 44 '-fno-rtti' ] | 44 '-fno-rtti' ] |
| 45 if target_type == 'js' | 45 if target_type == 'js' |
| 46 # CXXFLAGS specific to emcc | 46 # CXXFLAGS specific to emcc |
| 47 ADDITIONAL_PARAMS += [ '-m32', '--memory-init-file', '0', | 47 ADDITIONAL_PARAMS += [ '-m32', '--memory-init-file', '0', |
| 48 '--emit-symbol-map' ] | 48 '--emit-symbol-map' ] |
| 49 else | 49 else |
| 50 ADDITIONAL_PARAMS += [ '-fsanitize=address' ] | 50 ADDITIONAL_PARAMS += [ '-fsanitize=address' ] |
| 51 endif | 51 endif |
| 52 # additional params just for core | 52 # additional params just for core |
| 53 CORE_PARAMS = [ '-fno-exceptions' ] | 53 CORE_PARAMS = [ '-fno-exceptions' ] |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 219 ], | 219 ], |
| 220 cpp_args: GTEST_PARAMS) | 220 cpp_args: GTEST_PARAMS) |
| 221 abptest = executable('abptest', test_sources, | 221 abptest = executable('abptest', test_sources, |
| 222 cpp_args: ADDITIONAL_PARAMS + CORE_PARAMS + ['-DINSIDE_TE STS'], | 222 cpp_args: ADDITIONAL_PARAMS + CORE_PARAMS + ['-DINSIDE_TE STS'], |
| 223 include_directories: include_directories(join_paths(GTEST _DIR, 'include')), | 223 include_directories: include_directories(join_paths(GTEST _DIR, 'include')), |
| 224 link_args: LINK_PARAMS, | 224 link_args: LINK_PARAMS, |
| 225 link_with: [ adblockpluscore, gtest ]) | 225 link_with: [ adblockpluscore, gtest ]) |
| 226 test('abptest', abptest) | 226 test('abptest', abptest) |
| 227 endif | 227 endif |
| 228 | 228 |
| OLD | NEW |
« no previous file with comments
|
« compiled/bindings/generator.cpp ('k')
|
no next file »
|
no next file with comments »
