summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2014-06-19 02:25:51 -0300
committerMichael Niedermayer <michaelni@gmx.at>2014-06-19 13:18:30 +0200
commit60a06400a9fadb542bf8c7679bbbb17094edb71e (patch)
tree0bfc2ac3c634012559ea2ef73ac4790d66075f71 /configure
parent454c019cb536ba5bb2a80d47cfbd12168d1e1db4 (diff)
configure: fix NASM output format on Win64
Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure7
1 files changed, 6 insertions, 1 deletions
diff --git a/configure b/configure
index af40d34cc9..ccd5845efe 100755
--- a/configure
+++ b/configure
@@ -4467,7 +4467,12 @@ EOF
elif check_cmd nasm -v; then
yasmexe=nasm
yasm_debug="-g -F dwarf"
- enabled x86_64 && test "$objformat" = elf && objformat=elf64
+ if enabled x86_64; then
+ case "$objformat" in
+ elf) objformat=elf64 ;;
+ win32) objformat=win64 ;;
+ esac
+ fi
fi
YASMFLAGS="-f $objformat $yasm_extra"