mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-21 09:39:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "config.lib.sh: use brcm vg/egl/glesv2 packages on RPI"

Browse Source
This commit is contained in:
Conn O'Griofa 2017-08-21 04:20:40 +01:00 committed by GitHub
parent 585a931bb2
commit 87b743969d
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qb/config.libs.sh
View File

@ -48,7 +48,6 @@ if [ "$HAVE_VIDEOCORE" = 'yes' ]; then
[ -d /opt/vc/include/interface/vmcs_host/linux ] && add_include_dirs /opt/vc/include/interface/vmcs_host/linux [ -d /opt/vc/include/interface/vmcs_host/linux ] && add_include_dirs /opt/vc/include/interface/vmcs_host/linux
HAVE_OPENGLES='auto' HAVE_OPENGLES='auto'
EXTRA_GL_LIBS="-lbrcmEGL -lbrcmGLESv2 -lbcm_host -lvcos -lvchiq_arm" EXTRA_GL_LIBS="-lbrcmEGL -lbrcmGLESv2 -lbcm_host -lvcos -lvchiq_arm"
BRCM_PREFIX="brcm"
fi fi
if [ "$HAVE_NEON" = "yes" ]; then if [ "$HAVE_NEON" = "yes" ]; then
@ -102,7 +101,7 @@ if [ "$HAVE_SSE" = "yes" ]; then
fi fi
if [ "$HAVE_EGL" != "no" -a "$OS" != 'Win32' ]; then if [ "$HAVE_EGL" != "no" -a "$OS" != 'Win32' ]; then
check_pkgconf EGL "$BRCM_PREFIX"egl check_pkgconf EGL egl
# some systems have EGL libs, but no pkgconfig # some systems have EGL libs, but no pkgconfig
if [ "$HAVE_EGL" = "no" ]; then if [ "$HAVE_EGL" = "no" ]; then
HAVE_EGL=auto && check_lib EGL "-lEGL $EXTRA_GL_LIBS" HAVE_EGL=auto && check_lib EGL "-lEGL $EXTRA_GL_LIBS"
@ -379,12 +378,12 @@ if [ "$HAVE_EGL" = "yes" ]; then
add_define_make OPENGLES_LIBS "$OPENGLES_LIBS" add_define_make OPENGLES_LIBS "$OPENGLES_LIBS"
add_define_make OPENGLES_CFLAGS "$OPENGLES_CFLAGS" add_define_make OPENGLES_CFLAGS "$OPENGLES_CFLAGS"
else else
HAVE_OPENGLES=auto check_pkgconf OPENGLES "$BRCM_PREFIX"glesv2 HAVE_OPENGLES=auto check_pkgconf OPENGLES glesv2
[ "$HAVE_OPENGLES" = "no" ] && HAVE_OPENGLES=auto check_lib OPENGLES "-lGLESv2 $EXTRA_GL_LIBS" && add_define_make OPENGLES_LIBS "-lGLESv2 $EXTRA_GL_LIBS" [ "$HAVE_OPENGLES" = "no" ] && HAVE_OPENGLES=auto check_lib OPENGLES "-lGLESv2 $EXTRA_GL_LIBS" && add_define_make OPENGLES_LIBS "-lGLESv2 $EXTRA_GL_LIBS"
fi fi
fi fi
if [ "$HAVE_VG" != "no" ]; then if [ "$HAVE_VG" != "no" ]; then
check_pkgconf VG "$BRCM_PREFIX"vg check_pkgconf VG vg
if [ "$HAVE_VG" = "no" ]; then if [ "$HAVE_VG" = "no" ]; then
HAVE_VG=auto check_lib VG "-lOpenVG $EXTRA_GL_LIBS" HAVE_VG=auto check_lib VG "-lOpenVG $EXTRA_GL_LIBS"
[ "$HAVE_VG" = "yes" ] && VG_LIBS=-lOpenVG [ "$HAVE_VG" = "yes" ] && VG_LIBS=-lOpenVG