Merge remote-tracking branch 'seife/master'

This commit is contained in:
martii
2012-10-09 17:00:46 +02:00
29 changed files with 1330 additions and 1 deletions

View File

@@ -44,6 +44,18 @@ libstb_hal_a_LIBADD += \
azbox/record.o \
azbox/video.o
endif
if BOXTYPE_GENERIC
SUBDIRS += generic-pc
libstb_hal_a_LIBADD += \
generic-pc/audio.o \
generic-pc/dmx.o \
generic-pc/hardware_caps.o \
generic-pc/init.o \
generic-pc/playback.o \
generic-pc/pwrmngr.o \
generic-pc/record.o \
generic-pc/video.o
endif
if BOXTYPE_SPARK
libstb_hal_test_LDADD += -lasound
SUBDIRS += libspark libeplayer3