Merge pull request #20 from scott-t/t7g-ios

T7G iOS support

1 files changed, 30 insertions, 0 deletions

diff --git a/configure b/configure
index 3194f70f32..5d371c0679 100755
--- a/configure
+++ b/configure
@@ -133,6 +133,7 @@ _zlib=auto
 _mpeg2=no
 _png=auto
 _theoradec=auto
+_faad=auto
 _fluidsynth=auto
 _opengl=auto
 _opengles=auto
@@ -757,6 +758,9 @@ Optional Libraries:
   --with-theoradec-prefix=DIR Prefix where libtheoradec is installed (optional)
   --disable-theoradec      disable Theora decoder [autodetect]
 
+  --with-faad-prefix=DIR   Prefix where libfaad is installed (optional)
+  --disable-faad           disable AAC decoder [autodetect]
+
   --with-fluidsynth-prefix=DIR  Prefix where libfluidsynth is
                            installed (optional)
   --disable-fluidsynth     disable fluidsynth MIDI driver [autodetect]
@@ -813,6 +817,8 @@ for ac_option in $@; do
 	--enable-png)             _png=yes        ;;
 	--disable-theoradec)      _theoradec=no   ;;
 	--enable-theoradec)       _theoradec=yes  ;;
+	--disable-faad)           _faad=no        ;;
+	--enable-faad)            _faad=yes       ;;
 	--disable-fluidsynth)     _fluidsynth=no  ;;
 	--enable-readline)        _readline=yes   ;;
 	--disable-readline)       _readline=no    ;;
@@ -881,6 +887,11 @@ for ac_option in $@; do
 		THEORADEC_CFLAGS="-I$arg/include"
 		THEORADEC_LIBS="-L$arg/lib"
 		;;
+	--with-faad-prefix=*)
+		arg=`echo $ac_option | cut -d '=' -f 2`
+		FAAD_CFLAGS="-I$arg/include"
+		FAAD_LIBS="-L$arg/lib"
+		;;
 	--with-zlib-prefix=*)
 		arg=`echo $ac_option | cut -d '=' -f 2`
 		ZLIB_CFLAGS="-I$arg/include"
@@ -2786,6 +2797,25 @@ if test ! "$_theoradec" = notsupported ; then
 fi
 
 #
+# Check for the AAC decoder
+#
+echocheck "libfaad"
+if test "$_faad" = auto ; then
+	_faad=no
+	cat > $TMPC << EOF
+#include <neaacdec.h>
+int main(void) { NeAACDecGetCapabilities(); return 0; }
+EOF
+	cc_check $FAAD_CFLAGS $FAAD_LIBS -lfaad && _faad=yes
+fi
+if test "$_faad" = yes ; then
+	LIBS="$LIBS $FAAD_LIBS -lfaad"
+	INCLUDES="$INCLUDES $FAAD_CFLAGS"
+fi
+define_in_config_if_yes "$_faad" 'USE_FAAD'
+echo "$_faad"
+
+#
 # Check for SEQ MIDI
 #
 echocheck "SEQ MIDI"