From: Eric Engestrom Date: Mon, 14 May 2018 15:47:57 +0000 (+0100) Subject: docs/meson: mark code/commands as X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=37d44e26082e1e502259dd68bfbabb3a03e8acd7;p=mesa.git docs/meson: mark code/commands as Reviewed-by: Dylan Baker Signed-off-by: Eric Engestrom --- diff --git a/docs/meson.html b/docs/meson.html index 9706e49c5ca..f394a22fc2a 100644 --- a/docs/meson.html +++ b/docs/meson.html @@ -33,7 +33,7 @@ out in odd ways.

The meson program is used to configure the source directory and generates either a ninja build file or Visual Studio® build files. The latter must -be enabled via the --backend switch, as ninja is the default backend on all +be enabled via the --backend switch, as ninja is the default backend on all operating systems. Meson only supports out-of-tree builds, and must be passed a directory to put built and generated sources into. We'll call that directory "build" for examples. @@ -60,7 +60,7 @@ directory, but this feature is being discussed upstream.

With additional arguments meson configure is used to change options on already configured build directory. All options passed to this -command are in the form -D "command"="value". +command are in the form -D "command"="value".

@@ -114,13 +114,13 @@ change compiler in a configured build directory.
     CFLAGS=-Wno-typedef-redefinition ninja -C build-clang
 
-

Meson also honors DESTDIR for installs

+

Meson also honors DESTDIR for installs

LLVM

Meson includes upstream logic to wrap llvm-config using it's standard -dependency interface. It will search $PATH (or %PATH% on windows) for +dependency interface. It will search $PATH (or %PATH% on windows) for llvm-config, so using an LLVM from a non-standard path is as easy as PATH=/path/with/llvm-config:$PATH meson build.

@@ -152,13 +152,13 @@ configure
. Mesa defined options are always passed as -Doption=foo.

This option will set the compiler debug/optimisation levels to aid debugging the Mesa libraries.

-

Note that in meson this defaults to "debugoptimized", and not setting it to -"release" will yield non-optimal performance and binary size. Not using "debug" -may interfere with debugging as some code and validation will be optimized -away. +

Note that in meson this defaults to debugoptimized, and +not setting it to release will yield non-optimal +performance and binary size. Not using debug may interfere +with debugging as some code and validation will be optimized away.

-

For those wishing to pass their own optimization flags, use the "plain" +

For those wishing to pass their own optimization flags, use the plain buildtype, which causes meson to inject no additional compiler arguments, only those in the C/CXXFLAGS and those that mesa itself defines.

@@ -166,7 +166,7 @@ those in the C/CXXFLAGS and those that mesa itself defines.

-Db_ndebug
-

This option controls assertions in meson projects. When set to false +

This option controls assertions in meson projects. When set to false (the default) assertions are enabled, when set to true they are disabled. This is unrelated to the buildtype; setting the latter to release will not turn off assertions.