Browse code

Merge commit 'b0e8651a2a84553d08fbb2f7cb9697bd64fb1b55'

* commit 'b0e8651a2a84553d08fbb2f7cb9697bd64fb1b55':
doc: Amend the MSYS2 Documentation

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Hendrik Leppkes authored on 2015/12/07 22:18:41
Showing 1 changed files
... ...
@@ -107,10 +107,10 @@ Notes:
107 107
 
108 108
 @itemize
109 109
 
110
-@item Native MSYS building is discouraged, MSYS2 provides a full mingw-w64
111
-environment through @file{mingw64_shell.bat} or @file{mingw32_shell.bat}
112
-that should be used instead of the environment provides by
113
-@file{msys2_shell.bat}.
110
+@item Building for the MSYS environment is discouraged, MSYS2 provides a full
111
+MinGW-w64 environment through @file{mingw64_shell.bat} or
112
+@file{mingw32_shell.bat} that should be used instead of the environment
113
+provided by @file{msys2_shell.bat}.
114 114
 
115 115
 @item Building using MSYS2 can be sped up by disabling implicit rules in the
116 116
 Makefile by calling @code{make -r} instead of plain @code{make}. This
... ...
@@ -133,7 +133,8 @@ The MSYS2 MinGW-w64 environment provides ready to use toolchains and dependencie
133 133
 through @command{pacman}.
134 134
 
135 135
 Make sure to use @file{mingw64_shell.bat} or @file{mingw32_shell.bat} to have
136
-the correct MinGW-w64 environment.
136
+the correct MinGW-w64 environment. The default install provides shortcuts to
137
+them under @command{MinGW-w64 Win64 Shell} and @command{MinGW-w64 Win32 Shell}.
137 138
 
138 139
 @example
139 140
 # normal msys2 packages