diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2013-11-25 13:45:35 +0000 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2013-11-27 13:39:03 +0000 |
commit | fa515c2088e1d082d45741bbd5c05e13b0500804 (patch) | |
tree | 3767ee431edb44f9a85186cf01374a4c729971f2 | |
parent | 10421bcf0ab5d48fa3d84de803e657b77fe7d3c0 (diff) | |
download | ffmpeg-fa515c2088e1d082d45741bbd5c05e13b0500804.tar.gz |
doc/platform: Update to reflect current MSVC build situation
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
-rw-r--r-- | doc/platform.texi | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/doc/platform.texi b/doc/platform.texi index 2a7dd451db..a9cacfe408 100644 --- a/doc/platform.texi +++ b/doc/platform.texi @@ -103,14 +103,16 @@ you can build all libraries as DLLs. @section Microsoft Visual C++ or Intel C++ Compiler for Windows -Libav can be built with MSVC or ICL using a C99-to-C89 conversion utility and -wrapper. For ICL, only the wrapper is used, since ICL supports C99. +Libav can be built with MSVC 2012 or earlier using a C99-to-C89 conversion utility +and wrapper, or with MSVC 2013 and ICL natively. You will need the following prerequisites: @itemize @item @uref{https://github.com/libav/c99-to-c89/, C99-to-C89 Converter & Wrapper} +(if using MSVC 2012 or earlier) @item @uref{http://code.google.com/p/msinttypes/, msinttypes} +(if using MSVC 2012 or earlier) @item @uref{http://www.mingw.org/, MSYS} @item @uref{http://yasm.tortall.net/, YASM} @item @uref{http://gnuwin32.sourceforge.net/packages/bc.htm, bc for Windows} if @@ -120,14 +122,16 @@ you want to run @uref{fate.html, FATE}. To set up a proper environment in MSYS, you need to run @code{msys.bat} from the Visual Studio or Intel Compiler command prompt. -Place @code{makedef}, @code{c99wrap.exe}, @code{c99conv.exe}, and @code{yasm.exe} -somewhere in your @code{PATH}. +Place @code{yasm.exe} somewhere in your @code{PATH}. If using MSVC 2012 or +earlier, place @code{c99wrap.exe} and @code{c99conv.exe} somewhere in your +@code{PATH} as well. -Next, make sure @code{inttypes.h} and any other headers and libs you want to use -are located in a spot that the compiler can see. Do so by modifying the @code{LIB} -and @code{INCLUDE} environment variables to include the @strong{Windows} paths to -these directories. Alternatively, you can try and use the -@code{--extra-cflags}/@code{--extra-ldflags} configure options. +Next, make sure any other headers and libs you want to use, such as zlib, are +located in a spot that the compiler can see. Do so by modifying the @code{LIB} +and @code{INCLUDE} environment variables to include the @strong{Windows-style} +paths to these directories. Alternatively, you can try and use the +@code{--extra-cflags}/@code{--extra-ldflags} configure options. If using MSVC +2012 or earlier, place @code{inttypes.h} somewhere the compiler can see too. Finally, run: @@ -177,7 +181,9 @@ can see. @itemize @item Visual Studio 2010 Pro and Express @item Visual Studio 2012 Pro and Express +@item Visual Studio 2013 Pro and Express @item Intel Composer XE 2013 +@item Intel Composer XE 2013 SP1 @end itemize Anything else is not officially supported. |