diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2012-10-19 14:19:26 -0400 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2012-10-20 12:55:59 -0400 |
| commit | f2a7236d0c73050e59606f3c7f2fafcaa1ecb91a (patch) | |
| tree | 78ef3036ecd91e020f638f19e01b72d8223d5abb | |
| parent | ebe46b8063ae2e1ae77b6a83f6408c66e20a0728 (diff) | |
| download | ffmpeg-f2a7236d0c73050e59606f3c7f2fafcaa1ecb91a.tar.gz | |
doc/platform: Move a caveat down to the notes section
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| -rw-r--r-- | doc/platform.texi | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/doc/platform.texi b/doc/platform.texi index 3bb9f79e90..b692475c65 100644 --- a/doc/platform.texi +++ b/doc/platform.texi @@ -120,11 +120,6 @@ you want to run @uref{fate.html, FATE}. To set up a proper MSVC environment in MSYS, you simply need to run @code{msys.bat} from the Visual Studio command prompt. -Caveat: Run @code{which link} to see which link you are using. If it is located -at @code{/bin/link.exe}, then you have the wrong link in your @code{PATH}. -Either move/remove that copy, or make sure MSVC's link.exe is higher up in your -@code{PATH} than coreutils'. - Place @code{c99wrap.exe}, @code{c99conv.exe}, and @code{yasm.exe} somewhere in your @code{PATH}. @@ -146,6 +141,12 @@ Notes: @itemize +@item It is possible that coreutils' @code{link.exe} conflicts with MSVC's linker. +You can find out by running @code{which link} to see which @code{link.exe} you +are using. If it is located at @code{/bin/link.exe}, then you have the wrong one +in your @code{PATH}. Either move or remove that copy, or make sure MSVC's +@code{link.exe} takes precedence in your @code{PATH} over coreutils'. + @item If you wish to build with zlib support, you will have to grab a compatible zlib binary from somewhere, with an MSVC import lib, or if you wish to link statically, you can follow the instructions below to build a compatible |