mirror of https://git.ffmpeg.org/ffmpeg.git
build: fix commandline selection of nasm
"nasm --version" works on nasm since around version 2.11 and as
such configure assumed it was yasm.
Based on libav commit f54037da8a
by
Diego Biurrun.
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
parent
d44935cbf4
commit
3cc73d3d6d
|
@ -5490,16 +5490,26 @@ EOF
|
||||||
enabled ssse3 && check_inline_asm ssse3_inline '"pabsw %xmm0, %xmm0"'
|
enabled ssse3 && check_inline_asm ssse3_inline '"pabsw %xmm0, %xmm0"'
|
||||||
enabled mmxext && check_inline_asm mmxext_inline '"pmaxub %mm0, %mm1"'
|
enabled mmxext && check_inline_asm mmxext_inline '"pmaxub %mm0, %mm1"'
|
||||||
|
|
||||||
if ! disabled_any asm mmx x86asm; then
|
probe_x86asm(){
|
||||||
if check_cmd $x86asmexe --version; then
|
x86asmexe_probe=$1
|
||||||
x86asm_debug="-g dwarf2"
|
if check_cmd $x86asmexe_probe -v; then
|
||||||
X86ASMDEP='$(DEPX86ASM) $(X86ASMFLAGS) -M $(X86ASM_O) $< > $(@:.o=.d)'
|
x86asmexe=$x86asmexe_probe
|
||||||
elif check_cmd nasm -v; then
|
x86asm_type=nasm
|
||||||
x86asmexe=nasm
|
|
||||||
x86asm_debug="-g -F dwarf"
|
x86asm_debug="-g -F dwarf"
|
||||||
X86ASM_DEPFLAGS='-MD $(@:.o=.d)'
|
X86ASM_DEPFLAGS='-MD $(@:.o=.d)'
|
||||||
|
elif check_cmd $x86asmexe_probe --version; then
|
||||||
|
x86asmexe=$x86asmexe_probe
|
||||||
|
x86asm_type=yasm
|
||||||
|
x86asm_debug="-g dwarf2"
|
||||||
|
X86ASMDEP='$(DEPX86ASM) $(X86ASMFLAGS) -M $(X86ASM_O) $< > $(@:.o=.d)'
|
||||||
fi
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
if ! disabled_any asm mmx x86asm; then
|
||||||
|
for program in $x86asmexe yasm nasm; do
|
||||||
|
probe_x86asm $program
|
||||||
|
test -n "$x86asm_type" && break
|
||||||
|
done
|
||||||
X86ASMFLAGS="-f $objformat"
|
X86ASMFLAGS="-f $objformat"
|
||||||
enabled pic && append X86ASMFLAGS "-DPIC"
|
enabled pic && append X86ASMFLAGS "-DPIC"
|
||||||
test -n "$extern_prefix" && append X86ASMFLAGS "-DPREFIX"
|
test -n "$extern_prefix" && append X86ASMFLAGS "-DPREFIX"
|
||||||
|
@ -6600,6 +6610,7 @@ echo "big-endian ${bigendian-no}"
|
||||||
echo "runtime cpu detection ${runtime_cpudetect-no}"
|
echo "runtime cpu detection ${runtime_cpudetect-no}"
|
||||||
if enabled x86; then
|
if enabled x86; then
|
||||||
echo "standalone assembly ${x86asm-no}"
|
echo "standalone assembly ${x86asm-no}"
|
||||||
|
echo "x86 assembler ${x86asmexe}"
|
||||||
echo "MMX enabled ${mmx-no}"
|
echo "MMX enabled ${mmx-no}"
|
||||||
echo "MMXEXT enabled ${mmxext-no}"
|
echo "MMXEXT enabled ${mmxext-no}"
|
||||||
echo "3DNow! enabled ${amd3dnow-no}"
|
echo "3DNow! enabled ${amd3dnow-no}"
|
||||||
|
|
Loading…
Reference in New Issue