- TRIPLEDRAGON: deleted

Conflicts:
	lib/libdvbsub/dvbsub.cpp
	src/system/flashtool.cpp
This commit is contained in:
max_10
2020-10-03 22:47:34 +02:00
committed by Thilo Graf
parent fa91372706
commit 1fa824cab3
26 changed files with 22 additions and 637 deletions

View File

@@ -453,9 +453,9 @@ _TUXBOX_APPS_LIB_PKGCONFIG($1,$2)
AC_DEFUN([TUXBOX_BOXTYPE], [
AC_ARG_WITH(boxtype,
AS_HELP_STRING([--with-boxtype], [valid values: generic, tripledragon, spark, coolstream, armbox, mipsbox]),
AS_HELP_STRING([--with-boxtype], [valid values: generic, spark, coolstream, armbox, mipsbox]),
[case "${withval}" in
generic|tripledragon|spark|coolstream|armbox|mipsbox)
generic|spark|coolstream|armbox|mipsbox)
BOXTYPE="$withval"
;;
*)
@@ -520,7 +520,6 @@ AC_SUBST(BOXTYPE)
AC_SUBST(BOXMODEL)
AM_CONDITIONAL(BOXTYPE_GENERIC, test "$BOXTYPE" = "generic")
AM_CONDITIONAL(BOXTYPE_TRIPLE, test "$BOXTYPE" = "tripledragon")
AM_CONDITIONAL(BOXTYPE_SPARK, test "$BOXTYPE" = "spark")
AM_CONDITIONAL(BOXTYPE_COOL, test "$BOXTYPE" = "coolstream")
AM_CONDITIONAL(BOXTYPE_ARMBOX, test "$BOXTYPE" = "armbox")
@@ -555,8 +554,6 @@ AM_CONDITIONAL(BOXMODEL_VUDUO, test "$BOXMODEL" = "vuduo")
if test "$BOXTYPE" = "generic"; then
AC_DEFINE(HAVE_GENERIC_HARDWARE, 1, [building for a generic device like a standard PC])
elif test "$BOXTYPE" = "tripledragon"; then
AC_DEFINE(HAVE_TRIPLEDRAGON, 1, [building for a tripledragon])
elif test "$BOXTYPE" = "spark"; then
AC_DEFINE(HAVE_SPARK_HARDWARE, 1, [building for a goldenmedia 990 or edision pingulux])
elif test "$BOXTYPE" = "coolstream"; then