mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-26 15:02:56 +02:00
- rename BOXMODEL_CS => BOXMODEL_CST
Conflicts: data/scripts/Makefile.am src/gui/cam_menu.cpp src/gui/imageinfo_ni.cpp src/gui/osd_setup.cpp src/gui/update.cpp src/gui/update.h src/gui/update_menue.cpp src/neutrino.cpp src/system/setting_helpers.cpp Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
@@ -532,8 +532,8 @@ AM_CONDITIONAL(BOXMODEL_GENERIC, test "$BOXMODEL" = "generic")
|
||||
AM_CONDITIONAL(BOXMODEL_RASPI, test "$BOXMODEL" = "raspi")
|
||||
|
||||
# coolstream
|
||||
AM_CONDITIONAL(BOXMODEL_CS_HD1, test "$BOXMODEL" = "hd1")
|
||||
AM_CONDITIONAL(BOXMODEL_CS_HD2, test "$BOXMODEL" = "hd2")
|
||||
AM_CONDITIONAL(BOXMODEL_CST_HD1, test "$BOXMODEL" = "hd1")
|
||||
AM_CONDITIONAL(BOXMODEL_CST_HD2, test "$BOXMODEL" = "hd2")
|
||||
|
||||
# armbox
|
||||
AM_CONDITIONAL(BOXMODEL_HD51, test "$BOXMODEL" = "hd51")
|
||||
@@ -586,9 +586,9 @@ if test "$BOXMODEL" = "generic"; then
|
||||
elif test "$BOXMODEL" = "raspi"; then
|
||||
AC_DEFINE(BOXMODEL_RASPI, 1, [raspberry pi])
|
||||
elif test "$BOXMODEL" = "hd1"; then
|
||||
AC_DEFINE(BOXMODEL_CS_HD1, 1, [coolstream hd1/neo/neo2/zee])
|
||||
AC_DEFINE(BOXMODEL_CST_HD1, 1, [coolstream hd1/neo/neo2/zee])
|
||||
elif test "$BOXMODEL" = "hd2"; then
|
||||
AC_DEFINE(BOXMODEL_CS_HD2, 1, [coolstream tank/trinity/trinity v2/trinity duo/zee2/link])
|
||||
AC_DEFINE(BOXMODEL_CST_HD2, 1, [coolstream tank/trinity/trinity v2/trinity duo/zee2/link])
|
||||
elif test "$BOXMODEL" = "hd51"; then
|
||||
AC_DEFINE(BOXMODEL_HD51, 1, [hd51])
|
||||
elif test "$BOXMODEL" = "hd60"; then
|
||||
|
Reference in New Issue
Block a user