videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-10-06 02:05:36 +02:00
Code Releases Activity

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

Browse Source 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2012-10-19 14:19:26 -04:00
parent 79393a8363
commit 11a73745d5
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

@ -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 To set up a proper MSVC environment in MSYS, you simply need to run
@code{msys.bat} from the Visual Studio command prompt. @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 Place @code{c99wrap.exe}, @code{c99conv.exe}, and @code{yasm.exe} somewhere
in your @code{PATH}. in your @code{PATH}.
@ -152,6 +147,12 @@ Notes:
@itemize @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 @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 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 statically, you can follow the instructions below to build a compatible