Merge remote-tracking branch 'seife/master'

Origin commit data
------------------
Branch: master
Commit: 6f4449e1c5
Author: martii <m4rtii@gmx.de>
Date: 2013-10-06 (Sun, 06 Oct 2013)


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

------------------
This commit was generated by Migit
This commit is contained in:
martii
2013-10-06 14:41:32 +02:00
35 changed files with 1836 additions and 2 deletions

View File

@@ -23,10 +23,16 @@ libstb_hal_la_LIBADD += \
azbox/libazbox.la
endif
if BOXTYPE_GENERIC
if BOXMODEL_RASPI
SUBDIRS += raspi
libstb_hal_la_LIBADD += \
raspi/libraspi.la
else
SUBDIRS += generic-pc
libstb_hal_la_LIBADD += \
generic-pc/libgeneric.la
endif
endif
if BOXTYPE_SPARK
libstb_hal_test_LDADD += -lasound
SUBDIRS += libspark libeplayer3