summaryrefslogtreecommitdiff
path: root/doc/platform.texi
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2016-10-13 18:33:15 +0000
committerJames Almer <jamrial@gmail.com>2017-06-21 17:00:30 -0300
commit4f9297ac3b39098547863d28fbc8d2a906d5be49 (patch)
tree4672f09581a1a0e60b774e24f1f61457f5e69b0c /doc/platform.texi
parent3cc73d3d6d2a98cd0da3deda90760729c82cdeeb (diff)
build: Prefer NASM assembler over YASM
NASM is more actively maintained and permits generating dependency information as a sideeffect of assembling, thus cutting build times in half. (Cherry-picked from libav commit 57b753b445e23363c997a8ec1c556e0b0f6e9da3) Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'doc/platform.texi')
-rw-r--r--doc/platform.texi8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/platform.texi b/doc/platform.texi
index 32d97cc58b..bdfb6fd6a5 100644
--- a/doc/platform.texi
+++ b/doc/platform.texi
@@ -71,9 +71,9 @@ Mac OS X on PowerPC or ARM (iPhone) requires a preprocessor from
assembly functions. Put the Perl script somewhere
in your PATH, FFmpeg's configure will pick it up automatically.
-Mac OS X on amd64 and x86 requires @command{yasm} to build most of the
+Mac OS X on amd64 and x86 requires @command{nasm} to build most of the
optimized assembly functions. @uref{http://www.finkproject.org/, Fink},
-@uref{http://www.gentoo.org/proj/en/gentoo-alt/prefix/bootstrap-macos.xml, Gentoo Prefix},
+@uref{https://wiki.gentoo.org/wiki/Project:Prefix, Gentoo Prefix},
@uref{https://mxcl.github.com/homebrew/, Homebrew}
or @uref{http://www.macports.org, MacPorts} can easily provide it.
@@ -141,7 +141,7 @@ them under @command{MinGW-w64 Win64 Shell} and @command{MinGW-w64 Win32 Shell}.
pacman -S make pkgconf diffutils
# mingw-w64 packages and toolchains
-pacman -S mingw-w64-x86_64-yasm mingw-w64-x86_64-gcc mingw-w64-x86_64-SDL
+pacman -S mingw-w64-x86_64-nasm mingw-w64-x86_64-gcc mingw-w64-x86_64-SDL2
@end example
To target 32 bits replace @code{x86_64} with @code{i686} in the command above.
@@ -159,7 +159,7 @@ You will need the following prerequisites:
@item @uref{http://code.google.com/p/msinttypes/, msinttypes}
(if using MSVC 2012 or earlier)
@item @uref{http://msys2.github.io/, MSYS2}
-@item @uref{http://yasm.tortall.net/, YASM}
+@item @uref{http://www.nasm.us/, NASM}
(Also available via MSYS2's package manager.)
@end itemize