aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2015-12-07 14:18:41 +0100
committerHendrik Leppkes <h.leppkes@gmail.com>2015-12-07 14:18:41 +0100
commit4e01566941b53947110226cc7c451275003a3f2d (patch)
tree5627b249513494d3d07fe20d64a45b75831c77af /doc
parent14b583475607113a70796f5fa1477b880a950c8b (diff)
parentb0e8651a2a84553d08fbb2f7cb9697bd64fb1b55 (diff)
downloadffmpeg-4e01566941b53947110226cc7c451275003a3f2d.tar.gz
Merge commit 'b0e8651a2a84553d08fbb2f7cb9697bd64fb1b55'
* commit 'b0e8651a2a84553d08fbb2f7cb9697bd64fb1b55': doc: Amend the MSYS2 Documentation Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/platform.texi11
1 files changed, 6 insertions, 5 deletions
diff --git a/doc/platform.texi b/doc/platform.texi
index a4dcff5684..3f64069e81 100644
--- a/doc/platform.texi
+++ b/doc/platform.texi
@@ -107,10 +107,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
@@ -133,7 +133,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