mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-01 07:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

qb: Only look in /opt/vc/include if $HAVE_VIDEOCORE=yes.

Browse Source
This commit is contained in:
orbea 2018-01-01 11:28:19 -08:00
parent 48982de355
commit e2b003a993
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qb/config.libs.sh
View File

@ -21,6 +21,7 @@ CLIB=-lc
PTHREADLIB=-lpthread PTHREADLIB=-lpthread
SOCKETLIB=-lc SOCKETLIB=-lc
SOCKETHEADER= SOCKETHEADER=
INCLUDES='usr/include usr/local/include'
if [ "$OS" = 'BSD' ]; then if [ "$OS" = 'BSD' ]; then
[ -d /usr/local/include ] && add_dirs INCLUDE /usr/local/include [ -d /usr/local/include ] && add_dirs INCLUDE /usr/local/include
@ -48,7 +49,7 @@ if [ "$HAVE_VIDEOCORE" != "no" ]; then
check_pkgconf VC_TEST bcm_host check_pkgconf VC_TEST bcm_host
# use fallback if pkgconfig is not available # use fallback if pkgconfig is not available
if [ ! "$VC_TEST_LIBS" ]; then if [ -z "$VC_TEST_LIBS" ]; then
[ -d /opt/vc/lib ] && add_dirs LIBRARY /opt/vc/lib /opt/vc/lib/GL [ -d /opt/vc/lib ] && add_dirs LIBRARY /opt/vc/lib /opt/vc/lib/GL
check_lib '' VIDEOCORE -lbcm_host bcm_host_init "-lvcos -lvchiq_arm" check_lib '' VIDEOCORE -lbcm_host bcm_host_init "-lvcos -lvchiq_arm"
else else
@ -58,10 +59,11 @@ fi
if [ "$HAVE_VIDEOCORE" = 'yes' ]; then if [ "$HAVE_VIDEOCORE" = 'yes' ]; then
HAVE_OPENGLES='auto' HAVE_OPENGLES='auto'
VC_PREFIX="brcm" VC_PREFIX='brcm'
INCLUDES="${INCLUDES} opt/vc/include"
# use fallback if pkgconfig is not available # use fallback if pkgconfig is not available
if [ ! "$VC_TEST_LIBS" ]; then if [ -z "$VC_TEST_LIBS" ]; then
[ -d /opt/vc/include ] && add_dirs INCLUDE /opt/vc/include [ -d /opt/vc/include ] && add_dirs INCLUDE /opt/vc/include
[ -d /opt/vc/include/interface/vcos/pthreads ] && add_dirs INCLUDE /opt/vc/include/interface/vcos/pthreads [ -d /opt/vc/include/interface/vcos/pthreads ] && add_dirs INCLUDE /opt/vc/include/interface/vcos/pthreads
[ -d /opt/vc/include/interface/vmcs_host/linux ] && add_dirs INCLUDE /opt/vc/include/interface/vmcs_host/linux [ -d /opt/vc/include/interface/vmcs_host/linux ] && add_dirs INCLUDE /opt/vc/include/interface/vmcs_host/linux

9
qb/qb.libs.sh
View File

@ -168,10 +168,13 @@ check_val() # $1 = language $2 = HAVE_$2 $3 = lib $4 = include directory [che
check_lib "$1" "$2" "$3" check_lib "$1" "$2" "$3"
if [ "${4:-}" ] && [ "$answer" = 'yes' ]; then if [ "${4:-}" ] && [ "$answer" = 'yes' ]; then
for dir in usr/include usr/local/include opt/vc/include; do val="$2"
[ -d "/$dir/$4" ] && { eval "$2_CFLAGS=\"-I/$dir/$4\""; break; } include="$4"
eval "set -- $INCLUDES"
for dir do
[ -d "/$dir/$include" ] && { eval "${val}_CFLAGS=\"-I/$dir/$include\""; break; }
done done
[ -z "$(eval "printf %s \"\${$2_CFLAGS}\"")" ] && eval "HAVE_$2=no" [ -z "$(eval "printf %s \"\${${val}_CFLAGS}\"")" ] && eval "HAVE_$val=no"
fi fi
if [ "$answer" = 'no' ] && [ "$oldval" = 'yes' ]; then if [ "$answer" = 'no' ] && [ "$oldval" = 'yes' ]; then