aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorAlexander Strasser <eclipse7@gmx.net>2012-01-16 00:48:16 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-01-22 16:31:54 +0100
commit72b33eade1dbe599e261ca6a819a7ce9f6c2c165 (patch)
tree036457c167016dd14a33ce04e41afcc96115ce51 /configure
parent234405315f22c1b11531a7d313e7bd82b5283239 (diff)
downloadffmpeg-72b33eade1dbe599e261ca6a819a7ce9f6c2c165.tar.gz
build: Support selecting yasm-compatible assembler
Makes it possible to select the name/path of the tool for compiling the non-inline assembly code. Signed-off-by: Alexander Strasser <eclipse7@gmx.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure6
1 files changed, 4 insertions, 2 deletions
diff --git a/configure b/configure
index 2b6f450743..e77dda90dd 100755
--- a/configure
+++ b/configure
@@ -221,6 +221,7 @@ Advanced options (experts only):
--nm=NM use nm tool
--ar=AR use archive tool AR [$ar_default]
--as=AS use assembler AS [$as_default]
+ --yasmexe=EXE use yasm-compatible assembler EXE [$yasmexe_default]
--cc=CC use C compiler CC [$cc_default]
--cxx=CXX use C compiler CXX [$cxx_default]
--ld=LD use linker LD
@@ -1319,6 +1320,7 @@ CMDLINE_SET="
target_os
target_path
valgrind
+ yasmexe
"
CMDLINE_APPEND="
@@ -1800,7 +1802,7 @@ objformat="elf"
pkg_config_default=pkg-config
ranlib="ranlib"
strip_default="strip"
-yasmexe="yasm"
+yasmexe_default="yasm"
nm_opts='-g'
nogas=":"
@@ -2031,7 +2033,7 @@ strip_default="${cross_prefix}${strip_default}"
sysinclude_default="${sysroot}/usr/include"
-set_default cc cxx nm pkg_config strip sysinclude
+set_default cc cxx nm pkg_config strip sysinclude yasmexe
enabled cross_compile || host_cc_default=$cc
set_default host_cc