diff options
| author | Peter Harris <pharris@opentext.com> | 2020-05-08 19:06:05 -0400 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-10-14 19:35:28 +0300 |
| commit | 8b8a610ea4ed632759b831606723d1cafa8920d7 (patch) | |
| tree | f17fdb6172233d836fc3df17ff87292516f23dc6 /docs | |
| parent | e36f713a7f5cc10d3f8adc7ae1c73ef6cce51082 (diff) | |
| download | meson-8b8a610ea4ed632759b831606723d1cafa8920d7.zip meson-8b8a610ea4ed632759b831606723d1cafa8920d7.tar.gz meson-8b8a610ea4ed632759b831606723d1cafa8920d7.tar.bz2 | |
vs: add static_from_buildtype to b_vscrt
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/markdown/Builtin-options.md | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/docs/markdown/Builtin-options.md b/docs/markdown/Builtin-options.md index 05ff4ff..febcc8a 100644 --- a/docs/markdown/Builtin-options.md +++ b/docs/markdown/Builtin-options.md @@ -126,23 +126,23 @@ platforms or with all compilers: | b_sanitize | none | see below | Code sanitizer to use | | b_staticpic | true | true, false | Build static libraries as position independent | | b_pie | false | true, false | Build position-independent executables (since 0.49.0)| -| b_vscrt | from_buildtype| none, md, mdd, mt, mtd, from_buildtype | VS runtime library to use (since 0.48.0) | +| b_vscrt | from_buildtype| none, md, mdd, mt, mtd, from_buildtype, static_from_buildtype | VS runtime library to use (since 0.48.0) (static_from_buildtype since 0.56.0) | The value of `b_sanitize` can be one of: `none`, `address`, `thread`, `undefined`, `memory`, `address,undefined`. <a name="b_vscrt-from_buildtype"></a> -The default value of `b_vscrt` is `from_buildtype`. In that case, the following -table is used internally to pick the CRT compiler arguments based on the value -of the `buildtype` option: - -| buildtype | Visual Studio CRT | -| -------- | ----------------- | -| debug | `/MDd` | -| debugoptimized | `/MD` | -| release | `/MD` | -| minsize | `/MD` | -| custom | error! | +The default value of `b_vscrt` is `from_buildtype`. The following table is used +internally to pick the CRT compiler arguments for `from_buildtype` or +`static_from_buildtype` *(since 0.56)* based on the value of the `buildtype` option: + +| buildtype | from_buildtype | static_from_buildtype | +| -------- | -------------- | --------------------- | +| debug | `/MDd` | `/MTd` | +| debugoptimized | `/MD` | `/MT` | +| release | `/MD` | `/MT` | +| minsize | `/MD` | `/MT` | +| custom | error! | error! | ### Notes about Apple Bitcode support |