diff options
-rw-r--r-- | doc/html/meson.build | 15 | ||||
-rw-r--r-- | doc/singlehtml/meson.build | 15 | ||||
-rw-r--r-- | meson.build | 7 |
3 files changed, 20 insertions, 17 deletions
diff --git a/doc/html/meson.build b/doc/html/meson.build index 9c0da44..45374d3 100644 --- a/doc/html/meson.build +++ b/doc/html/meson.build @@ -6,12 +6,15 @@ html_dir = docdir / versioned_name / 'html' custom_target( 'html', build_by_default: true, - command: sphinx_build_command + [ - '-b', 'html', - '-t', 'html', - sphinx_in_dir, - '@OUTDIR@', - ], + command: ( + sphinx_build_command + + [ + '-b', 'html', + '-t', 'html', + sphinx_in_dir, + '@OUTDIR@', + ] + ), input: [api_zix_rst, conf_py, sphinx_input], install: true, install_dir: html_dir, diff --git a/doc/singlehtml/meson.build b/doc/singlehtml/meson.build index 33bff61..32a8201 100644 --- a/doc/singlehtml/meson.build +++ b/doc/singlehtml/meson.build @@ -6,12 +6,15 @@ singlehtml_dir = docdir / versioned_name / 'singlehtml' custom_target( 'singlehtml', build_by_default: true, - command: sphinx_build_command + [ - '-b', 'singlehtml', - '-t', 'singlehtml', - sphinx_in_dir, - '@OUTDIR@', - ], + command: ( + sphinx_build_command + + [ + '-b', 'singlehtml', + '-t', 'singlehtml', + sphinx_in_dir, + '@OUTDIR@', + ] + ), input: [api_zix_rst, conf_py, sphinx_input], install: true, install_dir: singlehtml_dir, diff --git a/meson.build b/meson.build index 7ab6b9a..d319296 100644 --- a/meson.build +++ b/meson.build @@ -253,7 +253,7 @@ else windows_checks = { 'CreateSymbolicLink': template.format( 'windows.h', - 'return CreateSymbolicLink(' + '"l", "t", SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE);', + 'return CreateSymbolicLink("l", "t", SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE);', ), } @@ -378,10 +378,7 @@ if cc.get_id() == 'emscripten' '-pthread', ] - wasm_link_args = [ - '-matomics', - '-mbulk-memory', - '-pthread', + wasm_link_args = wasm_c_args + [ ['-s', 'ENVIRONMENT=node,worker'], ['-s', 'INITIAL_MEMORY=33554432'], ] |