qb: detect Qt automatically

This commit is contained in:
Brad Parker 2018-04-30 22:11:55 -07:00
parent 9ba9f9e8bd
commit 791aaa00e1
3 changed files with 5 additions and 3 deletions

View File

@ -270,7 +270,7 @@ check_val '' PULSE -lpulse
check_val '' SDL -lSDL SDL
check_val '' SDL2 -lSDL2 SDL2
if [ "$HAVE_QT" = "yes" ]; then
if [ "$HAVE_QT" != 'no' ]; then
check_pkgconf QT5CORE Qt5Core 5.2
check_pkgconf QT5GUI Qt5Gui 5.2
check_pkgconf QT5WIDGETS Qt5Widgets 5.2
@ -283,6 +283,8 @@ if [ "$HAVE_QT" = "yes" ]; then
if [ "$HAVE_QT5CORE" = "no" ] || [ "$HAVE_QT5GUI" = "no" ] || [ "$HAVE_QT5WIDGETS" = "no" ]; then
die 1 'Error: Qt support requested, but required libraries could not be found.'
else
HAVE_QT=yes
fi
#if [ "$HAVE_QT5WEBENGINE" = "no" ]; then

View File

@ -101,7 +101,7 @@ HAVE_PRESERVE_DYLIB=no # Enable dlclose() for Valgrind support
HAVE_PARPORT=auto # Parallel port joypad support
HAVE_IMAGEVIEWER=yes # Built-in image viewer support.
HAVE_MMAP=auto # MMAP support
HAVE_QT=no # Qt companion support
HAVE_QT=auto # Qt companion support
C89_QT=no
HAVE_XSHM=no # XShm video driver support
HAVE_CHEEVOS=yes # Retro Achievements

View File

@ -83,7 +83,7 @@ if [ "$OS" = "Win32" ]; then
echo "$echobuf ... $WINDRES"
fi
if [ "$HAVE_QT" = "yes" ]; then
if [ "$HAVE_QT" != "no" ]; then
echobuf="Checking for moc"
if [ -z "$MOC" ]; then
MOC="$(exists "moc")" || MOC=""