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

Check for EGL/GLES/VG directly if pkgconfig is unavailable.

Browse Source 
This also allows to remove some videocore special cases.
This commit is contained in:
notaz 2012-12-12 02:34:01 +02:00
parent ee112fc375
commit 3576bcedd9
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -203,7 +203,7 @@ ifeq ($(HAVE_VG), 1)
endif endif
ifeq ($(HAVE_VIDEOCORE), 1) ifeq ($(HAVE_VIDEOCORE), 1)
LIBS += -lOpenVG -lGLESv2 -lEGL -lbcm_host -lvcos -lvchiq_arm LIBS += -lbcm_host -lvcos -lvchiq_arm
endif endif
ifeq ($(HAVE_XVIDEO), 1) ifeq ($(HAVE_XVIDEO), 1)

34
qb/config.libs.sh
View File

@ -17,11 +17,17 @@ check_lib VIDEOCORE -lbcm_host bcm_host_init "-lvcos -lvchiq_arm"
if [ "$HAVE_VIDEOCORE" = 'yes' ]; then if [ "$HAVE_VIDEOCORE" = 'yes' ]; then
[ -d /opt/vc/include ] && add_include_dirs /opt/vc/include [ -d /opt/vc/include ] && add_include_dirs /opt/vc/include
[ -d /opt/vc/include/interface/vcos/pthreads ] && add_include_dirs /opt/vc/include/interface/vcos/pthreads [ -d /opt/vc/include/interface/vcos/pthreads ] && add_include_dirs /opt/vc/include/interface/vcos/pthreads
HAVE_GLES='yes' HAVE_GLES='auto'
HAVE_VG='yes' EXTRA_GL_LIBS="-lGLESv2 -lbcm_host -lvcos -lvchiq_arm"
HAVE_EGL='yes' fi
else
if [ "$HAVE_EGL" != "no" ]; then
check_pkgconf EGL egl check_pkgconf EGL egl
# some systems have EGL libs, but no pkgconfig
if [ "$HAVE_EGL" = "no" ]; then
HAVE_EGL=auto && check_lib EGL "-lEGL $EXTRA_GL_LIBS"
[ "$HAVE_EGL" = "yes" ] && EGL_LIBS=-lEGL
fi
fi fi
if [ "$LIBRETRO" ]; then if [ "$LIBRETRO" ]; then
@ -149,17 +155,23 @@ fi
check_pkgconf XML libxml-2.0 check_pkgconf XML libxml-2.0
# On videocore, these libraries will exist without proper pkg-config. if [ "$HAVE_EGL" = "yes" ]; then
if [ "$HAVE_VIDEOCORE" != "yes" ] && [ "$HAVE_EGL" = "yes" ]; then if [ "$HAVE_XML" != "yes" ]; then
if [ "$HAVE_XML" = "yes" ]; then
check_pkgconf GLES glesv2
else
echo "Cannot find XML. GLES will not work." echo "Cannot find XML. GLES will not work."
exit 1 exit 1
fi fi
if [ "$HAVE_GLES" != "no" ]; then
HAVE_GLES=auto check_pkgconf GLES glesv2
[ "$HAVE_GLES" = "no" ] && HAVE_GLES=auto check_lib GLES "-lGLESv2 $EXTRA_GL_LIBS"
fi
if [ "$HAVE_VG" != "no" ]; then
check_pkgconf VG vg check_pkgconf VG vg
elif [ "$HAVE_VIDEOCORE" != "yes" ]; then if [ "$HAVE_VG" = "no" ]; then
HAVE_VG=auto check_lib VG "-lOpenVG $EXTRA_GL_LIBS"
[ "$HAVE_VG" = "yes" ] && VG_LIBS=-lOpenVG
fi
fi
else
HAVE_VG=no HAVE_VG=no
HAVE_GLES=no HAVE_GLES=no
fi fi