Merge pull request #1508 from vanfanel/master

Fixed building with dispmanx only with no OpenGL/GLES. Corrected comment...
This commit is contained in:
Twinaphex 2015-03-15 16:28:30 +01:00
commit 49e973c1d3
2 changed files with 4 additions and 3 deletions

View File

@ -326,7 +326,7 @@ static bool dispmanx_setup_scale(void *data, unsigned width,
dispmanx_free_main_resources(_dispvars);
vc_dispmanx_display_get_info(_dispvars->display, &(_dispvars->amode));
// We choose the pixel format depending on the bpp of the frame.
/* We choose the pixel format depending on the bpp of the frame. */
switch (_dispvars->bytes_per_pixel)
{
case 2:

View File

@ -111,8 +111,9 @@ if [ "$HAVE_EXYNOS" != "no" ]; then
fi
if [ "$HAVE_DISPMANX" != "no" ]; then
DISPMANX_LIBS="-L/opt/vc/lib -lbcm_host -lvcos -lvchiq_arm"
DISPMANX_INCLUDES="-I/opt/vc/include -I/opt/vc/include/interface/vmcs_host/linux/ -I/opt/vc/include/interface/vcos/pthreads"
DISPMANX_LIBS="-L/opt/vc/lib -lbcm_host -lvcos -lvchiq_arm"
DISPMANX_INCLUDES="-I/opt/vc/include -I/opt/vc/include/interface/vmcs_host/linux/ -I/opt/vc/include/interface/vcos/pthreads"
PKG_CONF_USED="$PKG_CONF_USED DISPMANX"
fi
if [ "$LIBRETRO" ]; then