mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 23:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	acinclude.m4
	src/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 195c22fffa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-16 (Thu, 16 Mar 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-16 22:29:22 +01:00
parent 9da6d922dd 60ebad8e33
commit 87c7eeeb3c
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
acinclude.m4
View File

@@ -37,11 +37,6 @@ if test "$enable_reschange" = "yes"; then
AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION,1,[enable change the osd resolution]) AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION,1,[enable change the osd resolution])
fi fi
AC_ARG_ENABLE(tmsdk,
AS_HELP_STRING(--enable-tmsdk, compile inside sdk),
,[enable_tmsdk=no])
AM_CONDITIONAL(ENABLE_TMSDK,test "$enable_tmsdk" = "yes")
AC_MSG_CHECKING(target) AC_MSG_CHECKING(target)
if test "$TARGET" = "native"; then if test "$TARGET" = "native"; then

4
src/Makefile.am
View File

@@ -151,14 +151,11 @@ else
neutrino_LDADD += -lcoolstream-mt -lca-sc neutrino_LDADD += -lcoolstream-mt -lca-sc
endif endif
if ENABLE_TMSDK
else
if BOXMODEL_CS_HD2 if BOXMODEL_CS_HD2
neutrino_LDADD += -lca-ci -llnxtmvssUsr -llnxUKAL -llnxplatUsr -llnxtmasUsr -llnxdvbciUsr -llnxpvrUsr -llnxcssUsr -llnxnotifyqUsr -ltmpvrDataManager-cst -ltmpvrIndexStorage -llnxscsUsr neutrino_LDADD += -lca-ci -llnxtmvssUsr -llnxUKAL -llnxplatUsr -llnxtmasUsr -llnxdvbciUsr -llnxpvrUsr -llnxcssUsr -llnxnotifyqUsr -ltmpvrDataManager-cst -ltmpvrIndexStorage -llnxscsUsr
else else
neutrino_LDADD += -lnxp neutrino_LDADD += -lnxp
endif endif
endif
if BOXMODEL_CS_HD2 if BOXMODEL_CS_HD2
neutrino_LDADD += -liconv neutrino_LDADD += -liconv
@@ -170,5 +167,4 @@ bin_PROGRAMS += rcsim
rcsim_SOURCES = rcsim.c rcsim.h rcsim_SOURCES = rcsim.c rcsim.h
bin_PROGRAMS += mdev_helper bin_PROGRAMS += mdev_helper
mdev_helper_SOURCES = mdev_helper.cpp mdev_helper_SOURCES = mdev_helper.cpp
endif endif