diff --git a/Makefile.am b/Makefile.am index 8ff5959..d275149 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,6 +33,14 @@ if BOXTYPE_GENERIC SUBDIRS += generic-pc libstb_hal_la_LIBADD += \ generic-pc/libgeneric.la + +libstb_hal_test_LDADD += \ + -lglut -lGL -lGLU -lGLEW \ + -lOpenThreads \ + @AVFORMAT_LIBS@ \ + @AVUTIL_LIBS@ \ + @AVCODEC_LIBS@ \ + @SWSCALE_LIBS@ endif if BOXTYPE_SPARK SUBDIRS += libspark libeplayer3 diff --git a/configure.ac b/configure.ac index c7ef49e..db9cf86 100644 --- a/configure.ac +++ b/configure.ac @@ -22,6 +22,12 @@ if test x"$BOXTYPE" = x"tripledragon"; then TUXBOX_APPS_LIB_PKGCONFIG(DIRECTFB, directfb) fi +if test x$BOXTYPE = xgeneric; then + TUXBOX_APPS_LIB_PKGCONFIG(AVFORMAT,libavformat) + TUXBOX_APPS_LIB_PKGCONFIG(AVCODEC,libavcodec) + TUXBOX_APPS_LIB_PKGCONFIG(AVUTIL,libavutil) + TUXBOX_APPS_LIB_PKGCONFIG(SWSCALE,libswscale) +fi AC_OUTPUT([ Makefile common/Makefile diff --git a/generic-pc/init.cpp b/generic-pc/init.cpp index 273cc04..4c4481a 100644 --- a/generic-pc/init.cpp +++ b/generic-pc/init.cpp @@ -1,21 +1,28 @@ #include + #include "init_lib.h" #include "lt_debug.h" +#include "glfb.h" #define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_INIT, NULL, args) #define lt_info(args...) _lt_info(TRIPLE_DEBUG_INIT, NULL, args) static bool initialized = false; +GLFramebuffer *glfb = NULL; void init_td_api() { if (!initialized) lt_debug_init(); lt_info("%s begin, initialized=%d, debug=0x%02x\n", __func__, (int)initialized, debuglevel); + if (! glfb) + glfb = new GLFramebuffer(720, 576); /* hard coded to PAL resolution for now */ initialized = true; } void shutdown_td_api() { lt_info("%s, initialized = %d\n", __func__, (int)initialized); + if (glfb) + delete glfb; initialized = false; }