spark: build libeplayer3 statically into libstb-hal

Origin commit data
------------------
Branch: master
Commit: 54592dc88b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-02-14 (Tue, 14 Feb 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2012-02-14 23:58:42 +01:00
parent d670397115
commit b4b3279dbd
4 changed files with 39 additions and 2 deletions

1
.gitignore vendored
View File

@@ -9,6 +9,7 @@
/depcomp /depcomp
/install-sh /install-sh
/common/Makefile.in /common/Makefile.in
/libeplayer3/Makefile.in
/libspark/Makefile.in /libspark/Makefile.in
/libtriple/Makefile.in /libtriple/Makefile.in
/ltmain.sh /ltmain.sh

View File

@@ -31,7 +31,7 @@ libstb_hal_a_LIBADD += \
libtriple/video_td.o libtriple/video_td.o
endif endif
if BOXTYPE_SPARK if BOXTYPE_SPARK
SUBDIRS += libspark SUBDIRS += libspark libeplayer3
libstb_hal_a_LIBADD += \ libstb_hal_a_LIBADD += \
libspark/audio.o \ libspark/audio.o \
libspark/ca.o \ libspark/ca.o \
@@ -43,4 +43,39 @@ libstb_hal_a_LIBADD += \
libspark/pwrmngr.o \ libspark/pwrmngr.o \
libspark/record.o \ libspark/record.o \
libspark/video.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 endif

View File

@@ -21,6 +21,7 @@ fi
AC_OUTPUT([ AC_OUTPUT([
Makefile Makefile
common/Makefile common/Makefile
libeplayer3/Makefile
libtriple/Makefile libtriple/Makefile
libspark/Makefile libspark/Makefile
]) ])

View File

@@ -3,7 +3,7 @@ lib_LTLIBRARIES = libeplayer3.la
CXXFLAGS = -Wall CXXFLAGS = -Wall
INCLUDES = \ INCLUDES = \
-Iinclude -I$(srcdir)/include
libeplayer3_la_SOURCES = \ libeplayer3_la_SOURCES = \
container/container.c container/container_ffmpeg.c container/text_srt.c \ container/container.c container/container_ffmpeg.c container/text_srt.c \