diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-08-23 00:26:44 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-23 00:26:44 +0300 |
commit | fc13c90de343f22f494cc1868bd76ac372236ee1 (patch) | |
tree | 9ce78640259911b2b5f420bd38552667c6ab8f74 /docs | |
parent | a9f33d96c674763657315770a99358d271206551 (diff) | |
parent | 9f338e41b06cbdd9a61a1122932177087c49bff8 (diff) | |
download | meson-fc13c90de343f22f494cc1868bd76ac372236ee1.zip meson-fc13c90de343f22f494cc1868bd76ac372236ee1.tar.gz meson-fc13c90de343f22f494cc1868bd76ac372236ee1.tar.bz2 |
Merge pull request #7600 from alexrp/master
Add C2x option support.
Diffstat (limited to 'docs')
-rw-r--r-- | docs/markdown/Builtin-options.md | 2 | ||||
-rw-r--r-- | docs/markdown/Configuring-a-build-directory.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/markdown/Builtin-options.md b/docs/markdown/Builtin-options.md index de801ab..7461fa6 100644 --- a/docs/markdown/Builtin-options.md +++ b/docs/markdown/Builtin-options.md @@ -163,7 +163,7 @@ compiler being used: | ------ | ------------- | --------------- | ----------- | | c_args | | free-form comma-separated list | C compile arguments to use | | c_link_args | | free-form comma-separated list | C link arguments to use | -| c_std | none | none, c89, c99, c11, c17, c18, gnu89, gnu99, gnu11, gnu17, gnu18 | C language standard to use | +| c_std | none | none, c89, c99, c11, c17, c18, c2x, gnu89, gnu99, gnu11, gnu17, gnu18, gnu2x | C language standard to use | | c_winlibs | see below | free-form comma-separated list | Standard Windows libs to link against | | c_thread_count | 4 | integer value ≥ 0 | Number of threads to use with emcc when using threads | | cpp_args | | free-form comma-separated list | C++ compile arguments to use | diff --git a/docs/markdown/Configuring-a-build-directory.md b/docs/markdown/Configuring-a-build-directory.md index 330899f..6081c35 100644 --- a/docs/markdown/Configuring-a-build-directory.md +++ b/docs/markdown/Configuring-a-build-directory.md @@ -60,7 +60,7 @@ sample output for a simple project. ------ ------------- --------------- ----------- c_args [] Extra arguments passed to the C compiler c_link_args [] Extra arguments passed to the C linker - c_std c99 [none, c89, c99, c11, c17, c18, gnu89, gnu99, gnu11, gnu17, gnu18] C language standard to use + c_std c99 [none, c89, c99, c11, c17, c18, c2x, gnu89, gnu99, gnu11, gnu17, gnu18, gnu2x] C language standard to use cpp_args [] Extra arguments passed to the C++ compiler cpp_debugstl false [true, false] STL debug mode cpp_link_args [] Extra arguments passed to the C++ linker |