aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2015-11-24 02:19:42 +0100
committerLuca Barbato <lu_zero@gentoo.org>2015-11-26 10:55:35 +0100
commitb0e8651a2a84553d08fbb2f7cb9697bd64fb1b55 (patch)
tree4f994fc05e8c1ac9b210a60e7d3760760287f4e9
parent4f979418c723652ad4e43115118c57a44bd46b52 (diff)
downloadffmpeg-b0e8651a2a84553d08fbb2f7cb9697bd64fb1b55.tar.gz
doc: Amend the MSYS2 Documentation
Explain better which environment is discouraged and mention the shortcuts names.
-rw-r--r--doc/platform.texi11
1 files changed, 6 insertions, 5 deletions
diff --git a/doc/platform.texi b/doc/platform.texi
index 09a38ff9e3..9c2b9bb067 100644
--- a/doc/platform.texi
+++ b/doc/platform.texi
@@ -101,10 +101,10 @@ Notes:
@itemize
-@item Native MSYS building is discouraged, MSYS2 provides a full mingw-w64
-environment through @file{mingw64_shell.bat} or @file{mingw32_shell.bat}
-that should be used instead of the environment provides by
-@file{msys2_shell.bat}.
+@item Building for the MSYS environment is discouraged, MSYS2 provides a full
+MinGW-w64 environment through @file{mingw64_shell.bat} or
+@file{mingw32_shell.bat} that should be used instead of the environment
+provided by @file{msys2_shell.bat}.
@item Building using MSYS2 can be sped up by disabling implicit rules in the
Makefile by calling @code{make -r} instead of plain @code{make}. This
@@ -126,7 +126,8 @@ The MSYS2 MinGW-w64 environment provides ready to use toolchains and dependencie
through @command{pacman}.
Make sure to use @file{mingw64_shell.bat} or @file{mingw32_shell.bat} to have
-the correct MinGW-w64 environment.
+the correct MinGW-w64 environment. The default install provides shortcuts to
+them under @command{MinGW-w64 Win64 Shell} and @command{MinGW-w64 Win32 Shell}.
@example
# normal msys2 packages