diff --git a/.gitignore b/.gitignore index cda5714..3e1d0de 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ /depcomp /install-sh /common/Makefile.in +/libeplayer3/Makefile.in /libspark/Makefile.in /libtriple/Makefile.in /ltmain.sh diff --git a/Makefile.am b/Makefile.am index 09d5e2e..3ab6aee 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,7 +31,7 @@ libstb_hal_a_LIBADD += \ libtriple/video_td.o endif if BOXTYPE_SPARK -SUBDIRS += libspark +SUBDIRS += libspark libeplayer3 libstb_hal_a_LIBADD += \ libspark/audio.o \ libspark/ca.o \ @@ -43,4 +43,39 @@ libstb_hal_a_LIBADD += \ libspark/pwrmngr.o \ libspark/record.o \ libspark/video.o + +# this is a hack to build the libeplayer3 objs statically into +# libstb-hal... +libstb_hal_a_LIBADD += \ + libeplayer3/.libs/container.o \ + libeplayer3/.libs/container_ffmpeg.o \ + libeplayer3/.libs/text_srt.o \ + libeplayer3/.libs/text_ssa.o \ + libeplayer3/.libs/container_ass.o \ + libeplayer3/.libs/audio.o \ + libeplayer3/.libs/manager.o \ + libeplayer3/.libs/subtitle.o \ + libeplayer3/.libs/video.o \ + libeplayer3/.libs/output_subtitle.o \ + libeplayer3/.libs/linuxdvb.o \ + libeplayer3/.libs/output.o \ + libeplayer3/.libs/playback.o \ + libeplayer3/.libs/writer.o \ + libeplayer3/.libs/aac.o \ + libeplayer3/.libs/wmv.o \ + libeplayer3/.libs/ac3.o \ + libeplayer3/.libs/divx.o \ + libeplayer3/.libs/wma.o \ + libeplayer3/.libs/pes.o \ + libeplayer3/.libs/dts.o \ + libeplayer3/.libs/mpeg2.o \ + libeplayer3/.libs/mp3.o \ + libeplayer3/.libs/misc.o \ + libeplayer3/.libs/h264.o \ + libeplayer3/.libs/h263.o \ + libeplayer3/.libs/vc1.o \ + libeplayer3/.libs/framebuffer.o \ + libeplayer3/.libs/vorbis.o \ + libeplayer3/.libs/flac.o \ + libeplayer3/.libs/pcm.o endif diff --git a/configure.ac b/configure.ac index 4f38271..ef01024 100644 --- a/configure.ac +++ b/configure.ac @@ -21,6 +21,7 @@ fi AC_OUTPUT([ Makefile common/Makefile +libeplayer3/Makefile libtriple/Makefile libspark/Makefile ]) diff --git a/libeplayer3/Makefile.am b/libeplayer3/Makefile.am index 24a6b98..6f941ce 100644 --- a/libeplayer3/Makefile.am +++ b/libeplayer3/Makefile.am @@ -3,7 +3,7 @@ lib_LTLIBRARIES = libeplayer3.la CXXFLAGS = -Wall INCLUDES = \ - -Iinclude + -I$(srcdir)/include libeplayer3_la_SOURCES = \ container/container.c container/container_ffmpeg.c container/text_srt.c \