mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-20 00:50:10 +01:00
ci/windows: Update documents to use winget
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> Reviewed-by: Jesse Natalie <jenatali@microsoft.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37210>
This commit is contained in:
parent
f0a811bb44
commit
3271b28864
2 changed files with 6 additions and 6 deletions
|
|
@ -19,7 +19,7 @@ the image is rebuilt inside the user's namespace.
|
|||
The rebuild executes `docker build` which calls `mesa_deps.ps1` inside the
|
||||
container to fetch and install all build dependencies. This includes Visual
|
||||
Studio Community Edition (downloaded from Microsoft, under the license which
|
||||
allows use by open-source projects), other build tools from Chocolatey, and
|
||||
allows use by open-source projects), other build tools from winget, and
|
||||
finally Meson and Python dependencies from PyPI.
|
||||
|
||||
This job is executed inside a Windows shell environment directly inside the
|
||||
|
|
|
|||
|
|
@ -111,18 +111,18 @@ You will need to install Python 3 and Meson as a module using pip. This
|
|||
is because we use Python for generating code, and rely on external
|
||||
modules (Mako). You also need pkg-config (a hard dependency of Meson),
|
||||
Flex, and Bison. The easiest way to install everything you need is with
|
||||
`Chocolatey <https://chocolatey.org/>`__.
|
||||
`WinGet <https://github.com/microsoft/winget-cli>`__.
|
||||
|
||||
.. code-block:: sh
|
||||
|
||||
choco install python3 winflexbison pkgconfiglite
|
||||
winget install python3 WinFlexBison.win_flex_bison bloodrock.pkg-config-lite
|
||||
|
||||
You can even use Chocolatey to install MinGW and Ninja (Ninja can be
|
||||
You can even use WinGet to install MinGW and Ninja (Ninja can be
|
||||
used with MSVC as well)
|
||||
|
||||
.. code-block:: sh
|
||||
|
||||
choco install ninja mingw
|
||||
winget install Ninja-build.Ninja MartinStorsjo.LLVM-MinGW.UCRT
|
||||
|
||||
Then install Meson using pip
|
||||
|
||||
|
|
@ -217,7 +217,7 @@ Windows specific instructions
|
|||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
On Windows you have a couple of choices for compilers. If you installed
|
||||
MinGW with Chocolatey and want to use Ninja you should be able to open
|
||||
MinGW with winget and want to use Ninja you should be able to open
|
||||
any shell and follow the instructions above. If you want to you MSVC,
|
||||
clang-cl, or ICL (the Intel Compiler), read on.
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue