Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2012-10-19 22:19:26 +0400
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2012-10-20 20:59:20 +0400
commit11a73745d5ee51d56c416cdc40c7a980186dbe40 (patch)
tree93db574cd5f66c9b021e5b002b6237f3b16106c9 /doc/platform.texi
parent79393a8363d6bb9920754247df00f1b5259e6efd (diff)
doc/platform: Move a caveat down to the notes section
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'doc/platform.texi')
-rw-r--r--doc/platform.texi11
1 files changed, 6 insertions, 5 deletions
diff --git a/doc/platform.texi b/doc/platform.texi
index 6047e71cfe..7499b9e8e9 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
-@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
+@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