docs: include explicit setup
in instructions
The implicit `meson builddir/` is deprecated, and while we have fixed our scripts, we forgot to update the docs we give our users ^^' Signed-off-by: Eric Engestrom <eric@engestrom.ch> Reviewed-by: Emma Anholt <emma@anholt.net> Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21468>
This commit is contained in:

committed by
Marge Bot

parent
a502f4fc13
commit
e316416dd0
@@ -41,7 +41,7 @@ one cross-compiling the turnip driver for a stock Pixel phone)
|
|||||||
|
|
||||||
.. code-block:: console
|
.. code-block:: console
|
||||||
|
|
||||||
meson build-android-aarch64 \
|
meson setup build-android-aarch64 \
|
||||||
--cross-file android-aarch64 \
|
--cross-file android-aarch64 \
|
||||||
-Dplatforms=android \
|
-Dplatforms=android \
|
||||||
-Dplatform-sdk-version=26 \
|
-Dplatform-sdk-version=26 \
|
||||||
|
@@ -86,7 +86,7 @@ The general approach is:
|
|||||||
|
|
||||||
.. code-block:: console
|
.. code-block:: console
|
||||||
|
|
||||||
meson builddir/
|
meson setup builddir/
|
||||||
ninja -C builddir/
|
ninja -C builddir/
|
||||||
sudo ninja -C builddir/ install
|
sudo ninja -C builddir/ install
|
||||||
|
|
||||||
@@ -94,7 +94,7 @@ On Windows you can also use the Visual Studio backend
|
|||||||
|
|
||||||
.. code-block:: console
|
.. code-block:: console
|
||||||
|
|
||||||
meson builddir --backend=vs
|
meson setup builddir --backend=vs
|
||||||
cd builddir
|
cd builddir
|
||||||
msbuild mesa.sln /m
|
msbuild mesa.sln /m
|
||||||
|
|
||||||
@@ -115,7 +115,7 @@ First, configure Mesa and install in the temporary location:
|
|||||||
|
|
||||||
.. code-block:: console
|
.. code-block:: console
|
||||||
|
|
||||||
meson builddir/ -Dprefix="$MESA_INSTALLDIR" OTHER_OPTIONS
|
meson setup builddir/ -Dprefix="$MESA_INSTALLDIR" OTHER_OPTIONS
|
||||||
ninja -C builddir/ install
|
ninja -C builddir/ install
|
||||||
|
|
||||||
where ``OTHER_OPTIONS`` is replaced by any meson configuration options you may
|
where ``OTHER_OPTIONS`` is replaced by any meson configuration options you may
|
||||||
@@ -124,7 +124,7 @@ like this:
|
|||||||
|
|
||||||
.. code-block:: console
|
.. code-block:: console
|
||||||
|
|
||||||
meson builddir/ -Dprefix="$MESA_INSTALLDIR" \
|
meson setup builddir/ -Dprefix="$MESA_INSTALLDIR" \
|
||||||
-Dgallium-drivers=swrast -Dvulkan-drivers=swrast
|
-Dgallium-drivers=swrast -Dvulkan-drivers=swrast
|
||||||
ninja -C builddir/ install
|
ninja -C builddir/ install
|
||||||
|
|
||||||
|
@@ -92,7 +92,7 @@ Basic configuration is done with:
|
|||||||
|
|
||||||
.. code-block:: console
|
.. code-block:: console
|
||||||
|
|
||||||
meson build/
|
meson setup build/
|
||||||
|
|
||||||
This will create the build directory. If any dependencies are missing,
|
This will create the build directory. If any dependencies are missing,
|
||||||
you can install them, or try to remove the dependency with a Meson
|
you can install them, or try to remove the dependency with a Meson
|
||||||
@@ -105,7 +105,7 @@ To review the options which Meson chose, run:
|
|||||||
meson configure build/
|
meson configure build/
|
||||||
|
|
||||||
Meson does not currently support listing configuration options before
|
Meson does not currently support listing configuration options before
|
||||||
running "meson build/" but this feature is being discussed upstream. For
|
running ``meson setup build/`` but this feature is being discussed upstream. For
|
||||||
now, we have a ``bin/meson-options.py`` script that prints the options
|
now, we have a ``bin/meson-options.py`` script that prints the options
|
||||||
for you. If that script doesn't work for some reason, you can always
|
for you. If that script doesn't work for some reason, you can always
|
||||||
look in the
|
look in the
|
||||||
@@ -197,7 +197,7 @@ for C++ sources:
|
|||||||
|
|
||||||
.. code-block:: console
|
.. code-block:: console
|
||||||
|
|
||||||
meson builddir/ -Dc_args=-fmax-errors=10 -Dcpp_args=-DMAGIC=123
|
meson setup builddir/ -Dc_args=-fmax-errors=10 -Dcpp_args=-DMAGIC=123
|
||||||
|
|
||||||
Compiler Specification
|
Compiler Specification
|
||||||
^^^^^^^^^^^^^^^^^^^^^^
|
^^^^^^^^^^^^^^^^^^^^^^
|
||||||
@@ -212,7 +212,7 @@ build directory before reconfiguring with an extra C option:
|
|||||||
|
|
||||||
.. code-block:: console
|
.. code-block:: console
|
||||||
|
|
||||||
CC=clang CXX=clang++ meson build-clang
|
CC=clang CXX=clang++ meson setup build-clang
|
||||||
ninja -C build-clang
|
ninja -C build-clang
|
||||||
ninja -C build-clang clean
|
ninja -C build-clang clean
|
||||||
meson configure build -Dc_args="-Wno-typedef-redefinition"
|
meson configure build -Dc_args="-Wno-typedef-redefinition"
|
||||||
@@ -236,7 +236,7 @@ For example:
|
|||||||
|
|
||||||
.. code-block:: console
|
.. code-block:: console
|
||||||
|
|
||||||
meson builddir -Dcmake_module_path=/home/user/mycmake/prefix
|
meson setup builddir -Dcmake_module_path=/home/user/mycmake/prefix
|
||||||
|
|
||||||
As of Meson 0.49.0 Meson also has the concept of a `"native
|
As of Meson 0.49.0 Meson also has the concept of a `"native
|
||||||
file" <https://mesonbuild.com/Native-environments.html>`__, these files
|
file" <https://mesonbuild.com/Native-environments.html>`__, these files
|
||||||
@@ -254,7 +254,7 @@ Then configure Meson:
|
|||||||
|
|
||||||
.. code-block:: console
|
.. code-block:: console
|
||||||
|
|
||||||
meson builddir/ --native-file custom-llvm.ini
|
meson setup builddir/ --native-file custom-llvm.ini
|
||||||
|
|
||||||
For selecting llvm-config for cross compiling a `"cross
|
For selecting llvm-config for cross compiling a `"cross
|
||||||
file" <https://mesonbuild.com/Cross-compilation.html#defining-the-environment>`__
|
file" <https://mesonbuild.com/Cross-compilation.html#defining-the-environment>`__
|
||||||
@@ -274,7 +274,7 @@ Then configure Meson:
|
|||||||
|
|
||||||
.. code-block:: console
|
.. code-block:: console
|
||||||
|
|
||||||
meson builddir/ --cross-file cross-llvm.ini
|
meson setup builddir/ --cross-file cross-llvm.ini
|
||||||
|
|
||||||
See the :ref:`Cross Compilation <cross-compilation>` section for more
|
See the :ref:`Cross Compilation <cross-compilation>` section for more
|
||||||
information.
|
information.
|
||||||
|
@@ -25,7 +25,7 @@ Configure and build Mesa with something like:
|
|||||||
|
|
||||||
.. code-block:: console
|
.. code-block:: console
|
||||||
|
|
||||||
meson builddir -Dosmesa=true -Dgallium-drivers=swrast -Dvulkan-drivers=[] -Dprefix=$PWD/builddir/install
|
meson setup builddir -Dosmesa=true -Dgallium-drivers=swrast -Dvulkan-drivers=[] -Dprefix=$PWD/builddir/install
|
||||||
ninja -C builddir install
|
ninja -C builddir install
|
||||||
|
|
||||||
Make sure you have LLVM installed first if you want to use the LLVMpipe
|
Make sure you have LLVM installed first if you want to use the LLVMpipe
|
||||||
|
Reference in New Issue
Block a user