[FFmpeg-cvslog] doc/platform: Move a caveat down to the notes section

Derek Buitenhuis git at videolan.org
Sat Oct 20 19:01:01 CEST 2012


ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Fri Oct 19 14:19:26 2012 -0400| [11a73745d5ee51d56c416cdc40c7a980186dbe40] | committer: Derek Buitenhuis

doc/platform: Move a caveat down to the notes section

Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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

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

diff --git a/doc/platform.texi b/doc/platform.texi
index 6047e71..7499b9e 100644
--- a/doc/platform.texi
+++ b/doc/platform.texi
@@ -126,11 +126,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
- at code{PATH} than coreutils'.
-
 Place @code{c99wrap.exe}, @code{c99conv.exe}, and @code{yasm.exe} somewhere
 in your @code{PATH}.
 
@@ -152,6 +147,12 @@ Notes:
 
 @itemize
 
+ at 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
+ at 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



More information about the ffmpeg-cvslog mailing list