diff --git a/src/Makefile.am b/src/Makefile.am index 23a3557a2..0a623d0a7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,6 +29,9 @@ endif if BOXTYPE_TRIPLE SUBDIRS += lcddisplay endif +if BOXTYPE_SPARK +SUBDIRS += lcddisplay +endif if USE_TREMOR VORBISLIBS = @VORBISIDEC_LIBS@ @@ -114,16 +117,17 @@ drivertool_SOURCES = drivertool.c endif if USE_STB_HAL neutrino_LDADD += \ - $(STB_HAL_LIB)/libstb-hal.a + $(STB_HAL_LIB)/libstb-hal.a \ + $(top_builddir)/src/lcddisplay/liblcddisplay.a else if BOXTYPE_TRIPLE neutrino_LDADD += \ - $(top_builddir)/lib/libtriple/libtriple.a -endif -endif -if BOXTYPE_TRIPLE -neutrino_LDADD += \ - @DIRECTFB_LIBS@ \ + $(top_builddir)/lib/libtriple/libtriple.a \ $(top_builddir)/src/lcddisplay/liblcddisplay.a endif +endif +if BOXTYPE_TRIPLE +neutrino_LDADD += \ + @DIRECTFB_LIBS@ +endif diff --git a/src/driver/Makefile.am b/src/driver/Makefile.am index b317a0029..a8716c074 100644 --- a/src/driver/Makefile.am +++ b/src/driver/Makefile.am @@ -49,6 +49,11 @@ libneutrino_driver_a_SOURCES += \ lcdd.cpp endif +if BOXTYPE_SPARK +libneutrino_driver_a_SOURCES += \ + newclock.cpp \ + lcdd.cpp +endif if USE_STB_HAL INCLUDES += \ -I$(STB_HAL_INC) \ diff --git a/src/driver/lcdd.h b/src/driver/lcdd.h index 1e7e5be15..d663fe696 100644 --- a/src/driver/lcdd.h +++ b/src/driver/lcdd.h @@ -83,6 +83,9 @@ typedef enum #include #include +#if HAVE_SPARK_HARDWARE +#define HAVE_GENERIC_HARDWARE 1 +#endif #include diff --git a/src/driver/newclock.h b/src/driver/newclock.h index 08e96c932..966c4787a 100644 --- a/src/driver/newclock.h +++ b/src/driver/newclock.h @@ -23,7 +23,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - +#ifdef HAVE_SPARK_HARDWARE +#define HAVE_GENERIC_HARDWARE 1 +#endif #include void InitNewClock(); diff --git a/src/global.h b/src/global.h index a5daecbd6..16baa195a 100644 --- a/src/global.h +++ b/src/global.h @@ -47,7 +47,7 @@ #include "driver/vfd.h" #include "driver/rfmod.h" #endif -#if HAVE_TRIPLEDRAGON +#if HAVE_TRIPLEDRAGON || HAVE_SPARK_HARDWARE #include "driver/lcdd.h" #define CVFD CLCD #endif diff --git a/src/lcddisplay/lcddisplay.cpp b/src/lcddisplay/lcddisplay.cpp index 4d71b3192..cf8293d2a 100644 --- a/src/lcddisplay/lcddisplay.cpp +++ b/src/lcddisplay/lcddisplay.cpp @@ -25,6 +25,9 @@ */ #include +#ifdef HAVE_SPARK_HARDWARE +#define HAVE_GENERIC_HARDWARE 1 +#endif #include "lcddisplay.h" #include diff --git a/src/lcddisplay/lcddisplay.h b/src/lcddisplay/lcddisplay.h index 6585c9713..099093191 100644 --- a/src/lcddisplay/lcddisplay.h +++ b/src/lcddisplay/lcddisplay.h @@ -26,6 +26,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifdef HAVE_SPARK_HARDWARE +#define HAVE_GENERIC_HARDWARE 1 +#endif #ifdef HAVE_GENERIC_HARDWARE // dummy #define LCD_ROWS 8 diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 622966b17..bdbcfe99b 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -289,7 +289,7 @@ const lcd_setting_struct_t lcd_setting[SNeutrinoSettings::LCD_SETTING_COUNT] = {"lcd_show_volume" , DEFAULT_LCD_SHOW_VOLUME }, {"lcd_autodimm" , DEFAULT_LCD_AUTODIMM }, {"lcd_deepbrightness" , DEFAULT_VFD_STANDBYBRIGHTNESS } -#if HAVE_TRIPLEDRAGON +#if HAVE_TRIPLEDRAGON || USE_STB_HAL ,{ "lcd_epgmode" , 0 /*DEFAULT_LCD_EPGMODE*/ } #endif }; diff --git a/src/system/settings.h b/src/system/settings.h index c34fe9f11..313009e55 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -491,7 +491,7 @@ struct SNeutrinoSettings LCD_SHOW_VOLUME , LCD_AUTODIMM , LCD_DEEPSTANDBY_BRIGHTNESS, -#if HAVE_TRIPLEDRAGON +#if HAVE_TRIPLEDRAGON || HAVE_SPARK_HARDWARE LCD_EPGMODE , #endif LCD_SETTING_COUNT