KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

docs: windows -> Windows 

Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6915>
This commit is contained in:
Erik Faye-Lund 2020-09-29 18:37:11 +02:00 committed by Marge Bot
parent 0df19e3c6b
commit 0e9d87eacc
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/install.rst
View File

@ -17,7 +17,7 @@ Build system
^^^^^^^^^^^^
- `Meson <https://mesonbuild.com>`__ is required when building on \*nix
platforms and is supported on windows.
platforms and is supported on Windows.
- `SCons <http://www.scons.org/>`__ is an alternative for building on
Windows and Linux.
- Android Build system when building as native Android component. Meson
@ -94,7 +94,7 @@ The general approach is:
ninja -C builddir/
sudo ninja -C builddir/ install
On windows you can also use the visual studio backend
On Windows you can also use the visual studio backend
::
@ -116,7 +116,7 @@ To build Mesa with SCons on Linux or Windows do
The build output will be placed in
build/\ *platform*-*machine*-*debug*/..., where *platform* is for
example Linux or windows, *machine* is x86 or x86_64, optionally
example Linux or Windows, *machine* is x86 or x86_64, optionally
followed by -debug for debug builds.
To build Mesa with SCons for Windows on Linux using the MinGW

8
docs/meson.rst
View File

@ -144,7 +144,7 @@ symbolic links for drivers). To install:
Windows specific instructions
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
On windows you have a couple of choices for compilers. If you installed
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
any shell and follow the instructions above. If you want to you MSVC,
clang-cl, or ICL (the Intel Compiler), read on.
@ -262,7 +262,7 @@ Then configure Meson:
Meson < 0.49 doesn't support native files, so to specify a custom
``llvm-config`` you need to modify your ``$PATH`` (or ``%PATH%`` on
windows), which will be searched for ``llvm-config``,
Windows), which will be searched for ``llvm-config``,
``llvm-config$version``, and ``llvm-config-$version``:
.. code-block:: console
@ -293,7 +293,7 @@ Then configure Meson:
See the :ref:`Cross Compilation <cross-compilation>` section for more
information.
On windows (and in other cases), using llvm-config or cmake may be
On Windows (and in other cases), using llvm-config or cmake may be
either undesirable or impossible. Meson's solution for this is a
`wrap <https://mesonbuild.com/Wrap-dependency-system-manual.html>`__, in
this case a "binary wrap". Follow the steps below:
@ -467,7 +467,7 @@ of those, as they'll have the right values for your system:
cpu = 'aarch64'
endian = 'little'
64-bit build on x86 windows:
64-bit build on x86 Windows:
::