mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 23:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/epgview.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: e61a23cb74
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-08 08:02:39 +01:00
parent 3451ef6f9f 68a1c5e30e
commit 54d7d92401
114 changed files with 4038 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@@ -146,10 +146,6 @@ AC_ARG_ENABLE(keyboard-no-rc,
[ --enable-keyboard-no-rc enable keyboard control, disable rc control],
[AC_DEFINE(KEYBOARD_INSTEAD_OF_REMOTE_CONTROL,1,[enable keyboard control, disable rc control])])
AC_ARG_ENABLE(restore-prev-mode,
[ --enable-restore-prev-mode enable return from graphics mode],
[AC_DEFINE(RETURN_FROM_GRAPHICS_MODE,1,[enable return from graphics mode])])
AC_ARG_ENABLE(mdev,
[ --enable-mdev disable broken neutrino mount hack, use with mdev],
[AC_DEFINE(ASSUME_MDEV,1,[disable broken neutrino mount hack, use with mdev])])
@@ -256,6 +252,9 @@ HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream2 -I$(top_srcdir)/src/zapit/inclu
fi
fi
# hack, so that framebuffer.h does not need to be included everywhere...
AC_DEFINE(fb_pixel_t, uint32_t, [hack, so that framebuffer.h does not need to be included everywhere...])
# hack to define a short filename also for out-of-tree build
if test `dirname $0` = `pwd` || test "$0" = ./configure; then
HWLIB_CFLAGS="$HWLIB_CFLAGS "'-D__file__=__FILE__'