mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-26 23:13:13 +02:00
- pick mipsbox code from DDT, TangoCash and max10
Conflicts: src/gui/cam_menu.cpp src/gui/update.cpp src/neutrino.cpp Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
@@ -145,7 +145,7 @@ TUXBOX_APPS_LIB_PKGCONFIG(AVCODEC,libavcodec)
|
||||
TUXBOX_APPS_LIB_PKGCONFIG(AVUTIL,libavutil)
|
||||
TUXBOX_APPS_LIB_PKGCONFIG(SIGC,sigc++-2.0)
|
||||
|
||||
if test "$BOXTYPE" = "armbox"; then
|
||||
if test "$BOXTYPE" = "armbox" -o "$BOXTYPE" = "mipsbox"; then
|
||||
TUXBOX_APPS_LIB_PKGCONFIG(SWSCALE,libswscale)
|
||||
fi
|
||||
|
||||
@@ -155,6 +155,7 @@ fi
|
||||
|
||||
if test "$BOXTYPE" = "coolstream" ||
|
||||
test "$BOXTYPE" = "armbox" ||
|
||||
test "$BOXTYPE" = "mipsbox" ||
|
||||
test "$BOXTYPE" = "generic" ||
|
||||
test "$BOXTYPE" = "tripledragon" ||
|
||||
test "$BOXTYPE" = "spark"; then
|
||||
|
Reference in New Issue
Block a user