diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-27 12:41:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-27 12:50:10 +0200 |
| commit | 46f01e413320acb86a66d13d13735694d1a0364d (patch) | |
| tree | ec613e274cac4a3b2bfdf8848b26ef72b13bfd92 | |
| parent | 90696ef368819a1a0576c0c96ce4349dd726dd4f (diff) | |
| parent | 6d3081e6c374ff7da12b07ed33d1662be1b32dbc (diff) | |
| download | ffmpeg-46f01e413320acb86a66d13d13735694d1a0364d.tar.gz | |
Merge commit '6d3081e6c374ff7da12b07ed33d1662be1b32dbc'
* commit '6d3081e6c374ff7da12b07ed33d1662be1b32dbc':
doc: Remove the now unnecessary remark about PATH and link.exe
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | doc/platform.texi | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/doc/platform.texi b/doc/platform.texi index 705a68006f..54f7bb7595 100644 --- a/doc/platform.texi +++ b/doc/platform.texi @@ -175,12 +175,6 @@ 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 |