diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/texi/Building.mingw.texi | 6 | ||||
| -rw-r--r-- | doc/texi/base/glossary.texi | 2 | ||||
| -rw-r--r-- | doc/texi/building/chapter.via.terminal.texi | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/texi/Building.mingw.texi b/doc/texi/Building.mingw.texi index af1692602..9764bf2ed 100644 --- a/doc/texi/Building.mingw.texi +++ b/doc/texi/Building.mingw.texi @@ -20,7 +20,7 @@ The following are the recommended specifications for building on @value{OS-mingw @itemize @bullet @item Intel 32-bit or 64-bit hardware -@item @value{OS-mingw} on Fedora 17+, Ubuntu 12+ or Debian, gcc 4.6+ +@item @value{OS-mingw} on Fedora 17+, Ubuntu 12+ or Debian using gcc 4.6+ @item yasm 1.2.x (for i386 or x86_64 architectures) @end itemize @@ -30,11 +30,11 @@ The following are the recommended specifications for building on @value{OS-mingw You must set the --cross flag with configure to cross compile with windows. See the Example below. Note that the cross compiler name varies between distributions. -As of this writing, @value{OS-mingw} has available to it several versions of gcc; only one of which may be found and used in the path as @code{gcc} and @code{g++}. Configure will thus find what is probably the older version of gcc in a typical @value{OS-mingw} environment. If you desire to build with the newer gcc, it is found in the path as @command{gcc-4} and @command{g++-4} respectively and you must indicate to configure the desired versions. The following syntax should do the trick: +The following is an example: @end quotation @example -../configure --cross=i686-w64-mingw32 --gcc=gcc-4 +../configure --cross=x86_64-w64-mingw32 @end example @include building/prerequisites.common.texi diff --git a/doc/texi/base/glossary.texi b/doc/texi/base/glossary.texi index 9edd3dd6d..17229cf30 100644 --- a/doc/texi/base/glossary.texi +++ b/doc/texi/base/glossary.texi @@ -5,4 +5,4 @@ @set OS-solaris Solaris @set OS-unix unix @set OS-windows Windows -@set OS-mingw MinGW +@set OS-mingw MinGW-W64 diff --git a/doc/texi/building/chapter.via.terminal.texi b/doc/texi/building/chapter.via.terminal.texi index e7190a450..b5c61eb38 100644 --- a/doc/texi/building/chapter.via.terminal.texi +++ b/doc/texi/building/chapter.via.terminal.texi @@ -145,7 +145,7 @@ Clean build output for @i{MODULE}. @anchor{terminal.targets.contrib} @subsection Contrib Modules -Contrib modules such as @samp{a52dec}, @samp{bzip2}, @samp{faac}, @samp{faad2}, @samp{ffmpeg}, @samp{fontconfig}, @samp{freetype}, @samp{fribidi}, @samp{lame}, @samp{libass}, @samp{libbluray}, @samp{libdca}, @samp{libdvdnav}, @samp{libdvdread}, @samp{libiconv}, @samp{libmkv}, @samp{libogg}, @samp{libsamplerate}, @samp{libtheora}, @samp{libvorbis}, @samp{libxml2}, @samp{mp4v2}, @samp{mpeg2dec}, @samp{x264}, @samp{yasm} and @samp{zlib} have the following scoped targets: +Contrib modules such as @samp{bzip2}, @samp{ffmpeg}, @samp{fontconfig}, @samp{freetype}, @samp{fribidi}, @samp{lame}, @samp{libass}, @samp{libbluray}, @samp{libdvdnav}, @samp{libdvdread}, @samp{libiconv}, @samp{libogg}, @samp{libsamplerate}, @samp{libtheora}, @samp{libvorbis}, @samp{libxml2}, @samp{x264}, @samp{yasm} and @samp{zlib} have the following scoped targets: @table @samp @item make @i{MODULE}.fetch |