Merge remote-tracking branch 'seife/master'

This commit is contained in:
martii
2013-05-04 20:52:54 +02:00
13 changed files with 1173 additions and 56 deletions

View File

@@ -33,6 +33,14 @@ if BOXTYPE_GENERIC
SUBDIRS += generic-pc
libstb_hal_la_LIBADD += \
generic-pc/libgeneric.la
libstb_hal_test_LDADD += \
-lglut -lGL -lGLU -lGLEW -lao \
-lOpenThreads \
@AVFORMAT_LIBS@ \
@AVUTIL_LIBS@ \
@AVCODEC_LIBS@ \
@SWSCALE_LIBS@
endif
if BOXTYPE_SPARK
libstb_hal_test_LDADD += -lasound