aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfigure30
-rw-r--r--ports.mk4
2 files changed, 34 insertions, 0 deletions
diff --git a/configure b/configure
index be1220cc8a..0ec1292afd 100755
--- a/configure
+++ b/configure
@@ -133,6 +133,7 @@ _zlib=auto
_mpeg2=no
_png=auto
_theoradec=auto
+_faad=auto
_fluidsynth=auto
_16bit=auto
_opengl=auto
@@ -756,6 +757,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]
@@ -814,6 +818,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 ;;
@@ -882,6 +888,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"
@@ -2573,6 +2584,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"
diff --git a/ports.mk b/ports.mk
index c56031ef11..efad75edc5 100644
--- a/ports.mk
+++ b/ports.mk
@@ -106,6 +106,10 @@ ifdef USE_THEORADEC
OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libtheoradec.a
endif
+ifdef USE_FAAD
+OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libfaad.a
+endif
+
ifdef USE_ZLIB
OSX_ZLIB ?= -lz
endif