Merge branch 'tmp'

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@763 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
seife
2010-09-12 16:13:53 +00:00
parent 82fd0787ee
commit 982b28298a
7 changed files with 131 additions and 11 deletions

View File

@@ -9,7 +9,6 @@ INCLUDES = \
-I$(top_srcdir)/lib/libeventserver \
-I$(top_srcdir)/lib/libnet \
-I$(top_srcdir)/lib/libconfigfile \
-I$(top_srcdir)/lib/libcoolstream \
-I$(top_srcdir)/lib/connection \
-I$(top_srcdir)/lib/libeventserver \
@FREETYPE_CFLAGS@ \
@@ -25,7 +24,6 @@ libneutrino_driver_a_SOURCES = \
rcinput.cpp \
vcrcontrol.cpp \
audioplay.cpp \
vfd.cpp \
stream2file.cpp \
screen_max.cpp \
slotbuffer.c \
@@ -37,5 +35,12 @@ libneutrino_driver_a_SOURCES = \
streamts.cpp \
rfmod.cpp
if BOXTYPE_COOL
libneutrino_driver_a_SOURCES += \
vfd.cpp
INCLUDES += \
-I$(top_srcdir)/lib/libcoolstream
endif
libneutrino_driver_netfile_a_SOURCES = netfile.cpp