configure: fix NASM output format on Win64
authorJames Almer <jamrial@gmail.com>
Thu, 19 Jun 2014 05:25:51 +0000 (02:25 -0300)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Jun 2014 11:18:30 +0000 (13:18 +0200)
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
configure

index af40d34..ccd5845 100755 (executable)
--- 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"