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

Makefiles.am: add conditional include for libcoolstream

Browse Source
This commit is contained in:
[CST] Focus
2013-01-11 14:17:16 +04:00
parent 185abd1a64
commit d3d2efe475
15 changed files with 76 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libdvbsub/Makefile.am
View File

@@ -5,8 +5,12 @@ INCLUDES = \
-I$(top_srcdir)/src/zapit/include
if BOXTYPE_COOL
if BOXMODEL_APOLLO
INCLUDES += -I$(top_srcdir)/lib/libcoolstream2
else
INCLUDES += -I$(top_srcdir)/lib/libcoolstream
endif
endif
if BOXTYPE_TRIPLE
INCLUDES += -I$(top_srcdir)/lib/libtriple
endif

5
lib/libtuxtxt/Makefile.am
View File

@@ -6,8 +6,13 @@ INCLUDES = \
$(FREETYPE_CFLAGS)
if BOXTYPE_COOL
if BOXMODEL_APOLLO
INCLUDES += -I$(top_srcdir)/lib/libcoolstream2
else
INCLUDES += -I$(top_srcdir)/lib/libcoolstream
endif
endif
if BOXTYPE_TRIPLE
INCLUDES += -I$(top_srcdir)/lib/libtriple
endif

12
src/Makefile.am
View File

@@ -19,8 +19,12 @@ INCLUDES = \
@LIBCS_CFLAGS@
if BOXTYPE_COOL
if BOXMODEL_APOLLO
INCLUDES += -I$(top_srcdir)/lib/libcoolstream2
else
INCLUDES += -I$(top_srcdir)/lib/libcoolstream
endif
endif
if BOXTYPE_TRIPLE
SUBDIRS += lcddisplay
INCLUDES += -I$(top_srcdir)/lib/libtriple
@@ -105,8 +109,12 @@ neutrino_LDADD += \
endif
if BOXTYPE_COOL
neutrino_LDADD += \
-lcoolstream-mt
neutrino_LDADD += -lcoolstream-mt
if ENABLE_TMSDK
else
neutrino_LDADD += -lnxp
endif
bin_PROGRAMS += drivertool

4
src/daemonc/Makefile.am
View File

@@ -13,8 +13,12 @@ INCLUDES = \
@FREETYPE_CFLAGS@
if BOXTYPE_COOL
if BOXMODEL_APOLLO
INCLUDES += -I$(top_srcdir)/lib/libcoolstream2
else
INCLUDES += -I$(top_srcdir)/lib/libcoolstream
endif
endif
if BOXTYPE_TRIPLE
INCLUDES += -I$(top_srcdir)/lib/libtriple
endif

7
src/driver/Makefile.am
View File

@@ -42,8 +42,11 @@ if BOXTYPE_COOL
libneutrino_driver_a_SOURCES += \
vfd.cpp
INCLUDES += \
-I$(top_srcdir)/lib/libcoolstream
if BOXMODEL_APOLLO
INCLUDES += -I$(top_srcdir)/lib/libcoolstream2
else
INCLUDES += -I$(top_srcdir)/lib/libcoolstream
endif
endif
if BOXTYPE_TRIPLE
libneutrino_driver_a_SOURCES += \

4
src/driver/audiodec/Makefile.am
View File

@@ -12,8 +12,12 @@ INCLUDES = \
@VORBISIDEC_CFLAGS@
if BOXTYPE_COOL
if BOXMODEL_APOLLO
INCLUDES += -I$(top_srcdir)/lib/libcoolstream2
else
INCLUDES += -I$(top_srcdir)/lib/libcoolstream
endif
endif
if BOXTYPE_TRIPLE
INCLUDES += -I$(top_srcdir)/lib/libtriple
endif

4
src/driver/pictureviewer/Makefile.am
View File

@@ -10,8 +10,12 @@ INCLUDES = \
@FREETYPE_CFLAGS@
if BOXTYPE_COOL
if BOXMODEL_APOLLO
INCLUDES += -I$(top_srcdir)/lib/libcoolstream2
else
INCLUDES += -I$(top_srcdir)/lib/libcoolstream
endif
endif
if BOXTYPE_TRIPLE
INCLUDES += -I$(top_srcdir)/lib/libtriple
endif

4
src/eitd/Makefile.am
View File

@@ -10,8 +10,12 @@ INCLUDES = \
-I$(top_srcdir)/lib/xmltree
if BOXTYPE_COOL
if BOXMODEL_APOLLO
INCLUDES += -I$(top_srcdir)/lib/libcoolstream2
else
INCLUDES += -I$(top_srcdir)/lib/libcoolstream
endif
endif
if BOXTYPE_TRIPLE
INCLUDES += -I$(top_srcdir)/lib/libtriple
endif

5
src/gui/Makefile.am
View File

@@ -36,8 +36,13 @@ INCLUDES = \
@FREETYPE_CFLAGS@
if BOXTYPE_COOL
if BOXMODEL_APOLLO
INCLUDES += -I$(top_srcdir)/lib/libcoolstream2
else
INCLUDES += -I$(top_srcdir)/lib/libcoolstream
endif
endif
if BOXTYPE_TRIPLE
INCLUDES += -I$(top_srcdir)/lib/libtriple
endif

8
src/gui/bedit/Makefile.am
View File

@@ -8,10 +8,16 @@ INCLUDES = \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/libeventserver \
-I$(top_srcdir)/lib/libconfigfile \
-I$(top_srcdir)/lib/libcoolstream \
-I$(top_srcdir)/lib/xmltree \
@FREETYPE_CFLAGS@
if BOXTYPE_COOL
if BOXMODEL_APOLLO
INCLUDES += -I$(top_srcdir)/lib/libcoolstream2
else
INCLUDES += -I$(top_srcdir)/lib/libcoolstream
endif
endif
noinst_LIBRARIES = libneutrino_gui_bedit.a

5
src/gui/widget/Makefile.am
View File

@@ -11,8 +11,13 @@ INCLUDES = \
@FREETYPE_CFLAGS@
if BOXTYPE_COOL
if BOXMODEL_APOLLO
INCLUDES += -I$(top_srcdir)/lib/libcoolstream2
else
INCLUDES += -I$(top_srcdir)/lib/libcoolstream
endif
endif
if BOXTYPE_TRIPLE
INCLUDES += -I$(top_srcdir)/lib/libtriple
endif

4
src/nhttpd/tuxboxapi/coolstream/Makefile.am
View File

@@ -16,8 +16,12 @@ INCLUDES = \
@FREETYPE_CFLAGS@
if BOXTYPE_COOL
if BOXMODEL_APOLLO
INCLUDES += -I$(top_srcdir)/lib/libcoolstream2
else
INCLUDES += -I$(top_srcdir)/lib/libcoolstream
endif
endif
if BOXTYPE_TRIPLE
INCLUDES += -I$(top_srcdir)/lib/libtriple
endif

4
src/system/Makefile.am
View File

@@ -15,8 +15,12 @@ INCLUDES = \
@FREETYPE_CFLAGS@
if BOXTYPE_COOL
if BOXMODEL_APOLLO
INCLUDES += -I$(top_srcdir)/lib/libcoolstream2
else
INCLUDES += -I$(top_srcdir)/lib/libcoolstream
endif
endif
if BOXTYPE_TRIPLE
INCLUDES += -I$(top_srcdir)/lib/libtriple
endif

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

@@ -12,8 +12,12 @@ INCLUDES = \
-I$(top_srcdir)/lib/xmltree
if BOXTYPE_COOL
if BOXMODEL_APOLLO
INCLUDES += -I$(top_srcdir)/lib/libcoolstream2
else
INCLUDES += -I$(top_srcdir)/lib/libcoolstream
endif
endif
if BOXTYPE_TRIPLE
INCLUDES += -I$(top_srcdir)/lib/libtriple
endif

7
src/zapit/src/zapit.cpp
View File

@@ -2036,6 +2036,7 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg)
audioDemux = new cDemux();
audioDemux->Open(DMX_AUDIO_CHANNEL);
#ifdef BOXMODEL_APOLLO
videoDecoder = cVideo::GetDecoder(0);
audioDecoder = cAudio::GetDecoder(0);
@@ -2045,6 +2046,12 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg)
audioDecoder->SetDemux(audioDemux);
audioDecoder->SetVideo(videoDecoder);
#else
videoDecoder = new cVideo(video_mode, videoDemux->getChannel(), videoDemux->getBuffer());
videoDecoder->Standby(false);
audioDecoder = new cAudio(audioDemux->getBuffer(), videoDecoder->GetTVEnc(), NULL /*videoDecoder->GetTVEncSD()*/);
#endif
videoDecoder->SetAudioHandle(audioDecoder->GetHandle());