Use correct asm object type and necessary -DPIC for yasm on 64-bit Darwin
authorDavid Conrad <lessen42@gmail.com>
Sat, 16 Aug 2008 17:18:23 +0000 (17:18 +0000)
committerRobert Swain <robert.swain@gmail.com>
Sat, 16 Aug 2008 17:18:23 +0000 (17:18 +0000)
Thread: [FFmpeg-devel] fft_mmx.asm yasm 64bit build broken
Patch by 'D' (lessen42 gmail com)

Originally committed as revision 14791 to svn://svn.ffmpeg.org/ffmpeg/trunk

configure

index 479105c..6195d81 100755 (executable)
--- a/configure
+++ b/configure
@@ -1262,6 +1262,7 @@ case $target_os in
         SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME).$(LIBMAJOR)$(SLIBSUF)'
         FFSERVERLDFLAGS=-Wl,-bind_at_load
         objformat="macho"
+        enabled x86_64 && objformat="macho64"
         ;;
     mingw32*)
         target_os=mingw32
@@ -1561,6 +1562,7 @@ EOF
     enabled_all x86_64 shared && append YASMFLAGS "-DPIC"
     case "$objformat" in
         elf) enabled debug && append YASMFLAGS "-g dwarf2" ;;
+        macho64)              append YASMFLAGS "-DPIC -DPREFIX" ;;
         *)                    append YASMFLAGS "-DPREFIX"  ;;
     esac
     check_yasm "pabsw xmm0, xmm0" && enable yasm