mirror of
https://github.com/libretro/RetroArch
synced 2025-03-29 22:20:21 +00:00
travis: Enable building qt for linux.
This commit is contained in:
parent
db0cb37dc3
commit
6f094a3fdd
@ -35,11 +35,11 @@ matrix:
|
||||
addons:
|
||||
# Install a more recent clang than the default
|
||||
apt:
|
||||
packages:
|
||||
- clang-3.8
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
- llvm-toolchain-precise-3.8
|
||||
packages:
|
||||
- clang-3.8
|
||||
env: COMPILER_NAME=clang-3.8 CXX=clang++-3.8 CC=clang-3.8
|
||||
- os: osx
|
||||
osx_image: xcode8
|
||||
@ -82,6 +82,8 @@ addons:
|
||||
- qt5-default
|
||||
- qt5-qmake
|
||||
- qtbase5-dev-tools
|
||||
- qtbase5-dev
|
||||
- qtdeclarative5-dev
|
||||
coverity_scan:
|
||||
project:
|
||||
name: "RetroArch"
|
||||
|
@ -284,7 +284,6 @@ if [ "$HAVE_QT" != 'no' ] && [ "$HAVE_MOC" = 'yes' ]; then
|
||||
check_pkgconf QT5CONCURRENT Qt5Concurrent 5.2
|
||||
check_pkgconf QT5NETWORK Qt5Network 5.2
|
||||
#check_pkgconf QT5WEBENGINE Qt5WebEngine 5.4
|
||||
check_pkgconf OPENSSL openssl 1.0.0
|
||||
|
||||
# pkg-config is needed to reliably find Qt5 libraries.
|
||||
|
||||
@ -295,6 +294,8 @@ if [ "$HAVE_QT" != 'no' ] && [ "$HAVE_MOC" = 'yes' ]; then
|
||||
HAVE_QT=yes
|
||||
fi
|
||||
|
||||
check_pkgconf OPENSSL openssl 1.0.0
|
||||
|
||||
#if [ "$HAVE_QT5WEBENGINE" = "no" ]; then
|
||||
# die : 'Notice: Qt5WebEngine not found, disabling web browser support.'
|
||||
#fi
|
||||
|
Loading…
x
Reference in New Issue
Block a user