Skip to content

Commit 00c05a6

Browse files
committed
Add an environment overview page and re-order the menu
To reduce the confusion a bit when users are confronted with 5 launchers after the install
1 parent 30d22da commit 00c05a6

File tree

8 files changed

+34
-2
lines changed

8 files changed

+34
-2
lines changed

Diff for: mkdocs.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,9 @@ nav:
5959
# For users of MSYS2 which just use the provided software
6060
# or develop their software using MSYS2 provided packages/tools.
6161
- docs/what-is-msys2.md
62-
- docs/ci.md
6362
- docs/who-is-using-msys2.md
63+
- docs/environments.md
64+
- docs/ci.md
6465
- docs/terminals.md
6566
- docs/package-management.md
6667
- docs/filesystem-paths.md

Diff for: web/docs/clang64.png

5.94 KB
Loading

Diff for: web/docs/environments.md

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Environments
2+
3+
MSYS2 comes with different environments/subsystems and the first thing you have
4+
to decide is which one to use. The differences between the environments is
5+
mainly between environment variables, default compilers/linkers, architecture,
6+
system libraries used etc. If you are unsure, go with **MINGW64**.
7+
8+
The **MSYS** environment contains the unixy/cygwin based tools, lives under
9+
`/usr` and is special in that it is always active. All the other environments
10+
inherit from the **MSYS** one and add various things on top of it.
11+
12+
For example in the **MINGW64** environment your `$PATH` starts with
13+
`/mingw64/bin:/usr/bin` so you get all mingw64 based tools as well as all msys
14+
tools.
15+
16+
## Overview
17+
18+
|| Name | Prefix | Toolchain | Architecture | C Library | C++ Library |
19+
| - |- |- |-|-|-|-|
20+
| ![msys](msys.png){: style="max-width:25px" } | **MSYS** | `/usr` | gcc | x86_64 | cygwin | cygwin |
21+
| ![mingw64](mingw64.png){: style="max-width:25px" } | **MINGW64** | `/mingw64` | gcc | x86_64 | msvcrt | libstdc++ |
22+
| ![ucrt64](ucrt64.png){: style="max-width:25px" } | **UCRT64** | `/ucrt64` | gcc | x86_64 | ucrt | libstdc++ |
23+
| ![clang64](clang64.png){: style="max-width:25px" } | **CLANG64** | `/clang64` | llvm | x86_64 | ucrt | libc++ |
24+
| ![mingw32](mingw32.png){: style="max-width:25px" } | **MINGW32** | `/mingw32` | gcc | i686 | msvcrt | libstdc++ |
25+

Diff for: web/docs/mingw32.png

5.8 KB
Loading

Diff for: web/docs/mingw64.png

6.02 KB
Loading

Diff for: web/docs/msys.png

6.25 KB
Loading

Diff for: web/docs/ucrt64.png

5.95 KB
Loading

Diff for: web/stylesheets/extra.css

+7-1
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,10 @@
3232
.md-typeset code {
3333
background-color: #fafafa;
3434
border: 1px solid #ddd;
35-
padding: 0.1em 0.25em;
35+
padding: 0.05em 0.25em;
3636
box-shadow: none;
37+
word-break: normal;
38+
color: var(--md-code-hl-name-color);
3739
}
3840

3941
.md-typeset h2 {
@@ -93,6 +95,10 @@ table, .admonition {
9395
background-color: #fafafa;
9496
}
9597

98+
.md-typeset table tr th {
99+
min-width: 0 !important;
100+
}
101+
96102
.md-header, .md-footer, .md-nav__source {
97103
background-color: var(--msys2-dark-bg) !important;
98104
}

0 commit comments

Comments
 (0)