diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-01-19 18:47:20 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-01-21 13:58:02 +0000 |
| commit | 6c906ded380e9a11ff350c17f0e03271c8fb6154 (patch) | |
| tree | fabfe9938b09d0b32afc0d3afdb93744067e4973 /doc/platform.texi | |
| parent | 0d64982828aee5f3495a71050e4930fa2898ca15 (diff) | |
| download | ffmpeg-6c906ded380e9a11ff350c17f0e03271c8fb6154.tar.gz | |
doc/platform: Reference only MSYS2 and MinGW-w64
It's better to steer users at these, since they are both better
and more alive than the mingw.org versions.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'doc/platform.texi')
| -rw-r--r-- | doc/platform.texi | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/doc/platform.texi b/doc/platform.texi index ca76492753..a852170f4f 100644 --- a/doc/platform.texi +++ b/doc/platform.texi @@ -96,9 +96,9 @@ the FFmpeg Windows Help Forum at @url{http://ffmpeg.zeranoe.com/forum/}. @section Native Windows compilation using MinGW or MinGW-w64 -FFmpeg can be built to run natively on Windows using the MinGW or MinGW-w64 -toolchains. Install the latest versions of MSYS and MinGW or MinGW-w64 from -@url{http://www.mingw.org/} or @url{http://mingw-w64.sourceforge.net/}. +FFmpeg can be built to run natively on Windows using the MinGW-w64 +toolchain. Install the latest versions of MSYS2 and MinGW-w64 from +@url{http://msys2.github.io/} and/or @url{http://mingw-w64.sourceforge.net/}. You can find detailed installation instructions in the download section and the FAQ. @@ -106,7 +106,7 @@ Notes: @itemize -@item Building natively using MSYS can be sped up by disabling implicit rules +@item Building natively using MSYS2 can be sped up by disabling implicit rules in the Makefile by calling @code{make -r} instead of plain @code{make}. This speed up is close to non-existent for normal one-off builds and is only noticeable when running make for a second time (for example during @@ -133,13 +133,14 @@ You will need the following prerequisites: (if using MSVC 2012 or earlier) @item @uref{http://code.google.com/p/msinttypes/, msinttypes} (if using MSVC 2012 or earlier) -@item @uref{http://www.mingw.org/, MSYS} +@item @uref{http://msys2.github.io/, MSYS2} @item @uref{http://yasm.tortall.net/, YASM} +(Also available via MSYS2's package manager.) @item @uref{http://gnuwin32.sourceforge.net/packages/bc.htm, bc for Windows} if you want to run @uref{fate.html, FATE}. @end itemize -To set up a proper environment in MSYS, you need to run @code{msys.bat} from +To set up a proper environment in MSYS2, you need to run @code{msys_shell.bat} from the Visual Studio or Intel Compiler command prompt. Place @code{yasm.exe} somewhere in your @code{PATH}. If using MSVC 2012 or |