mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 01:11:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tmp'

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Makefile.am
View File

@@ -12,11 +12,14 @@ INCLUDES = \
-I$(top_srcdir)/lib/libnet \
-I$(top_srcdir)/lib/xmltree \
-I$(top_srcdir)/lib/libmd5sum \
-I$(top_srcdir)/lib/libcoolstream \
-I$(top_srcdir)/lib/libupnpclient \
@FREETYPE_CFLAGS@ \
@LIBCS_CFLAGS@
if BOXTYPE_COOL
INCLUDES += -I$(top_srcdir)/lib/libcoolstream
endif
bin_PROGRAMS = neutrino
neutrino_SOURCES = neutrino_menue.cpp neutrino.cpp
@@ -65,6 +68,11 @@ neutrino_LDADD = \
-lvorbisfile -lvorbis -logg \
-lungif \
-ljpeg \
-lcoolstream \
-lnxp \
-lrt -lpthread
if BOXTYPE_COOL
neutrino_LDADD += \
-lcoolstream \
-lnxp
endif

9
src/driver/Makefile.am
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

5
src/gui/Makefile.am
View File

@@ -22,12 +22,15 @@ INCLUDES = \
-I$(top_srcdir)/lib/libnet \
-I$(top_srcdir)/lib/libconfigfile \
-I$(top_srcdir)/lib/xmltree \
-I$(top_srcdir)/lib/libcoolstream \
-I$(top_srcdir)/lib/libupnpclient \
@CURL_CFLAGS@ \
@FREETYPE_CFLAGS@ \
-I$(top_srcdir)/lib
if BOXTYPE_COOL
INCLUDES += -I$(top_srcdir)/lib/libcoolstream
endif
noinst_LIBRARIES = libtimerlist.a libneutrino_gui.a libneutrino_gui2.a
libneutrino_gui_a_SOURCES = \

5
src/system/Makefile.am
View File

@@ -8,11 +8,14 @@ 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/libmd5sum \
-I$(top_srcdir)/lib/xmltree \
@FREETYPE_CFLAGS@
if BOXTYPE_COOL
INCLUDES += -I$(top_srcdir)/lib/libcoolstream
endif
noinst_LIBRARIES = libneutrino_system.a
libneutrino_system_a_SOURCES = \

7
src/zapit/src/Makefile.am
View File

@@ -7,8 +7,11 @@ INCLUDES = \
-I$(top_srcdir)/lib/libconfigfile \
-I$(top_srcdir)/lib/connection \
-I$(top_srcdir)/lib/libeventserver \
-I$(top_srcdir)/lib/xmltree \
-I$(top_srcdir)/lib/libcoolstream
-I$(top_srcdir)/lib/xmltree
if BOXTYPE_COOL
INCLUDES += -I$(top_srcdir)/lib/libcoolstream
endif
noinst_LIBRARIES = libzapit.a