CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-22 18:58:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5593 from orbea/pdksh

Browse Source 
qb: Explicitly set variables as a single command.
This commit is contained in:
Twinaphex 2017-10-24 02:09:32 +02:00 committed by GitHub
commit 0731bbb81c
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qb/config.libs.sh
View File

@ -122,7 +122,7 @@ if [ "$HAVE_EGL" != "no" -a "$OS" != 'Win32' ]; then
check_pkgconf EGL "$VC_PREFIX"egl check_pkgconf EGL "$VC_PREFIX"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 "-l"$VC_PREFIX"EGL $EXTRA_GL_LIBS" HAVE_EGL=auto; check_lib EGL "-l"$VC_PREFIX"EGL $EXTRA_GL_LIBS"
[ "$HAVE_EGL" = "yes" ] && EGL_LIBS=-l"$VC_PREFIX"EGL [ "$HAVE_EGL" = "yes" ] && EGL_LIBS=-l"$VC_PREFIX"EGL
else else
EGL_LIBS="$EGL_LIBS $EXTRA_GL_LIBS" EGL_LIBS="$EGL_LIBS $EXTRA_GL_LIBS"
@ -383,14 +383,17 @@ 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 "$VC_PREFIX"glesv2 HAVE_OPENGLES=auto; check_pkgconf OPENGLES "$VC_PREFIX"glesv2
[ "$HAVE_OPENGLES" = "no" ] && HAVE_OPENGLES=auto check_lib OPENGLES "-l"$VC_PREFIX"GLESv2 $EXTRA_GL_LIBS" && add_define_make OPENGLES_LIBS "-l"$VC_PREFIX"GLESv2 $EXTRA_GL_LIBS" if [ "$HAVE_OPENGLES" = "no" ]; then
HAVE_OPENGLES=auto; check_lib OPENGLES "-l"$VC_PREFIX"GLESv2 $EXTRA_GL_LIBS"
add_define_make OPENGLES_LIBS "-l"$VC_PREFIX"GLESv2 $EXTRA_GL_LIBS"
fi
fi fi
fi fi
if [ "$HAVE_VG" != "no" ]; then if [ "$HAVE_VG" != "no" ]; then
check_pkgconf VG "$VC_PREFIX"vg check_pkgconf VG "$VC_PREFIX"vg
if [ "$HAVE_VG" = "no" ]; then if [ "$HAVE_VG" = "no" ]; then
HAVE_VG=auto check_lib VG "-l"$VC_PREFIX"OpenVG $EXTRA_GL_LIBS" HAVE_VG=auto; check_lib VG "-l"$VC_PREFIX"OpenVG $EXTRA_GL_LIBS"
[ "$HAVE_VG" = "yes" ] && VG_LIBS=-l"$VC_PREFIX"OpenVG [ "$HAVE_VG" = "yes" ] && VG_LIBS=-l"$VC_PREFIX"OpenVG
fi fi
fi fi
@ -437,7 +440,7 @@ fi
if [ "$HAVE_UDEV" != "no" ]; then if [ "$HAVE_UDEV" != "no" ]; then
check_pkgconf UDEV libudev check_pkgconf UDEV libudev
if [ "$HAVE_UDEV" = "no" ]; then if [ "$HAVE_UDEV" = "no" ]; then
HAVE_UDEV=auto && check_lib UDEV "-ludev" HAVE_UDEV=auto; check_lib UDEV "-ludev"
[ "$HAVE_UDEV" = "yes" ] && UDEV_LIBS=-ludev [ "$HAVE_UDEV" = "yes" ] && UDEV_LIBS=-ludev
fi fi
fi fi