diff options
| author | jstebbins <[email protected]> | 2013-03-03 16:18:16 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2013-03-03 16:18:16 +0000 |
| commit | 288639e626b5c550fdd33e49abf1b8e3a3fcd52e (patch) | |
| tree | 0df5c1da8728a0706110984b675a0d3b7a350ba9 /gtk | |
| parent | b56a9d0fc23ca64f1d63afb797bdc07e1dffc357 (diff) | |
Add optional fdk-aac encoder
configure --enable-fdk-aac to enable this encoder
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5287 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/configure.ac | 11 | ||||
| -rw-r--r-- | gtk/module.defs | 3 | ||||
| -rw-r--r-- | gtk/src/Makefile.am | 15 |
3 files changed, 14 insertions, 15 deletions
diff --git a/gtk/configure.ac b/gtk/configure.ac index d13659b4b..6d013f935 100644 --- a/gtk/configure.ac +++ b/gtk/configure.ac @@ -56,6 +56,10 @@ AC_ARG_ENABLE(dl, AS_HELP_STRING([--enable-dl], [enable libdl]), use_libdl=yes, use_libdl=no) +AC_ARG_ENABLE(fdk-aac, + AS_HELP_STRING([--enable-fdk-aac], [enable fdk aac encoder]), + use_fdk_aac=yes, use_fdk_aac=no) + AC_ARG_ENABLE(gst, AS_HELP_STRING([--disable-gst], [disable gstreamer (live preview)]), gst_disable=yes, gst_disable=no) @@ -199,6 +203,13 @@ case $host in ;; esac +HB_LIBS="-lhb -la52 -lmkv -lavresample -lavformat -lavcodec -lavutil -ldvdnav -ldvdread -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lmp4v2 -lswscale -ltheoraenc -ltheoradec -lz -lbz2 -lpthread -lbluray -lass -lfontconfig -lfreetype -lxml2" + +if test "x$use_fdk_aac" = "xyes" ; then + HB_LIBS+=" -lfdk-aac" +fi + +AC_SUBST(HB_LIBS) AC_SUBST(GHB_TOOLS_CFLAGS) AC_SUBST(GHB_TOOLS_LIBS) AC_SUBST(GHB_CFLAGS) diff --git a/gtk/module.defs b/gtk/module.defs index c37af412e..8eddc6d91 100644 --- a/gtk/module.defs +++ b/gtk/module.defs @@ -29,3 +29,6 @@ ifeq (0,$(FEATURE.gst)) GTK.CONFIGURE.extra += --disable-gst endif +ifeq (1,$(FEATURE.fdk_aac)) + GTK.CONFIGURE.extra += --enable-fdk-aac +endif diff --git a/gtk/src/Makefile.am b/gtk/src/Makefile.am index 2aff574ad..1320d5b2b 100644 --- a/gtk/src/Makefile.am +++ b/gtk/src/Makefile.am @@ -1,20 +1,5 @@ ## Process this file with automake to produce Makefile.in -if MINGW -HB_LIBS= \ - -lhb -la52 -lmkv -lavresample -lavformat -lavcodec -lavutil \ - -ldvdnav -ldvdread -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc \ - -logg -lsamplerate -lx264 -lmp4v2 -lswscale -ltheoraenc -ltheoradec -lz \ - -lbz2 -lpthreadGC2 -lbluray -lass -lfontconfig -lfreetype -lxml2 \ - -lgmodule-2.0 -else -HB_LIBS= \ - -lhb -la52 -lmkv -lavresample -lavformat -lavcodec -lavutil \ - -ldvdnav -ldvdread -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc \ - -logg -lsamplerate -lx264 -lmp4v2 -lswscale -ltheoraenc -ltheoradec -lz \ - -lbz2 -lpthread -lbluray -lass -lfontconfig -lfreetype -lxml2 -endif - icons = \ hb-icon.256.png \ hb-icon.128.png \ |