[FFmpeg-cvslog] doc: Amend the MSYS2 Documentation

Luca Barbato git at videolan.org
Mon Dec 7 14:18:50 CET 2015


ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Tue Nov 24 02:19:42 2015 +0100| [b0e8651a2a84553d08fbb2f7cb9697bd64fb1b55] | committer: Luca Barbato

doc: Amend the MSYS2 Documentation

Explain better which environment is discouraged and mention the
shortcuts names.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b0e8651a2a84553d08fbb2f7cb9697bd64fb1b55
---

 doc/platform.texi |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/doc/platform.texi b/doc/platform.texi
index 09a38ff..9c2b9bb 100644
--- a/doc/platform.texi
+++ b/doc/platform.texi
@@ -101,10 +101,10 @@ Notes:
 
 @itemize
 
- at 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
- at file{msys2_shell.bat}.
+ at item Building for the MSYS environment is discouraged, MSYS2 provides a full
+MinGW-w64 environment through @file{mingw64_shell.bat} or
+ at 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



More information about the ffmpeg-cvslog mailing list