oops

[ffmpeg] / configure

diff --git a/configure b/configure
index 3adcc351896f886de6bee41a3bcf790eebaa8f42..585caa2daa147904b1b4f27e463a4ce8c9285611 100755 (executable)
--- a/configure
+++ b/configure
@@ -27,6 +27,7 @@ echo "  --enable-shared-pp       use libpostproc.so [default=no]"
 echo "  --enable-shared          build shared libraries [default=no]"
 echo "  --enable-amr_nb          enable amr_nb float audio codec"
 echo "  --enable-amr_nb-fixed    use fixed point for amr-nb codec"
+echo "  --enable-amr_wb          enable amr_wb float audio codec"
 echo "  --enable-sunmlib         use Sun medialib [default=no]"
 echo ""
 echo "Advanced options (experts only):"
@@ -147,6 +148,7 @@ debug="yes"
 extralibs="-lm"
 simpleidct="yes"
 bigendian="no"
+inttypes="yes"
 emu_fast_int="no"
 vhook="default"
 dlfcn="no"
@@ -237,7 +239,7 @@ SHFLAGS="-dynamiclib"
 extralibs=""
 darwin="yes"
 strip="strip -x"
-LDFLAGS="-d"
+LDFLAGS="-Wl,-d"
 FFSLDFLAGS=-Wl,-bind_at_load
 ;;
 MINGW32*)
@@ -409,6 +411,8 @@ for opt do
   ;;
   --enable-amr_nb-fixed) amr_nb_fixed="yes"
   ;;
+  --enable-amr_wb) amr_wb="yes"
+  ;; 
   --enable-sunmlib) sunmlib="yes"
   ;;
   esac
@@ -630,6 +634,17 @@ fi
 
 fi
 
+# ---
+# *inttypes.h* test
+cat > $TMPC << EOF
+#include <inttypes.h>
+int main(int argc, char ** argv){
+    return 0;
+}
+EOF
+
+$cc -o $TMPE $TMPC 2>/dev/null || inttypes="no"
+
 # ---
 # *int_fast* test
 cat > $TMPC << EOF
@@ -867,6 +882,7 @@ echo "C compiler       $cc"
 echo "make             $make"
 echo "CPU              $cpu ($tune)"
 echo "Big Endian       $bigendian"
+echo "inttypes.h       $inttypes"
 echo "broken inttypes.h $emu_fast_int"
 if test $cpu = "x86"; then
 echo "MMX enabled      $mmx"
@@ -969,14 +985,11 @@ if test "$bigendian" = "yes" ; then
   echo "WORDS_BIGENDIAN=yes" >> config.mak
   echo "#define WORDS_BIGENDIAN 1" >> $TMPH
 fi
+if test "$inttypes" != "yes" ; then
+  echo "#define EMULATE_INTTYPES 1" >> $TMPH
+fi
 if test "$emu_fast_int" = "yes" ; then
-#note, we dont try to emulate fast64
-  echo "typedef signed char int_fast8_t;" >> $TMPH
-  echo "typedef signed int  int_fast16_t;" >> $TMPH
-  echo "typedef signed int  int_fast32_t;" >> $TMPH
-  echo "typedef unsigned char uint_fast8_t;" >> $TMPH
-  echo "typedef unsigned int  uint_fast16_t;" >> $TMPH
-  echo "typedef unsigned int  uint_fast32_t;" >> $TMPH
+  echo "#define EMULATE_FAST_INT 1" >> $TMPH
 fi
 if test "$mmx" = "yes" ; then
   echo "TARGET_MMX=yes" >> config.mak
@@ -1246,6 +1259,7 @@ else
   echo "REL-5 V5.1.0 from "
   echo "http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26104-510.zip"
   echo "and extracted the source to libavcodec/amr_float"
+  echo "and if u try this on an alpha, u may need to change Word32 to int in amr/typedef.h"
   echo
 fi