RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'b0e8651a2a84553d08fbb2f7cb9697bd64fb1b55' 

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-12-07 14:18:41 +01:00
parent 14b5834756 b0e8651a2a
commit 4e01566941
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/platform.texi
View File

@ -107,10 +107,10 @@ Notes:
@itemize @itemize
@item Native MSYS building is discouraged, MSYS2 provides a full mingw-w64 @item Building for the MSYS environment is discouraged, MSYS2 provides a full
environment through @file{mingw64_shell.bat} or @file{mingw32_shell.bat} MinGW-w64 environment through @file{mingw64_shell.bat} or
that should be used instead of the environment provides by @file{mingw32_shell.bat} that should be used instead of the environment
@file{msys2_shell.bat}. provided by @file{msys2_shell.bat}.
@item Building using MSYS2 can be sped up by disabling implicit rules in the @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 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}. through @command{pacman}.
Make sure to use @file{mingw64_shell.bat} or @file{mingw32_shell.bat} to have 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 @example
# normal msys2 packages # normal msys2 packages