mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

travis: Enable building qt for linux.

Browse Source
This commit is contained in:
orbea 2019-01-17 18:51:55 -08:00
parent db0cb37dc3
commit 6f094a3fdd
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -35,11 +35,11 @@ matrix:
addons: addons:
# Install a more recent clang than the default # Install a more recent clang than the default
apt: apt:
packages:
- clang-3.8
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.8 - llvm-toolchain-precise-3.8
packages:
- clang-3.8
env: COMPILER_NAME=clang-3.8 CXX=clang++-3.8 CC=clang-3.8 env: COMPILER_NAME=clang-3.8 CXX=clang++-3.8 CC=clang-3.8
- os: osx - os: osx
osx_image: xcode8 osx_image: xcode8
@ -82,6 +82,8 @@ addons:
- qt5-default - qt5-default
- qt5-qmake - qt5-qmake
- qtbase5-dev-tools - qtbase5-dev-tools
- qtbase5-dev
- qtdeclarative5-dev
coverity_scan: coverity_scan:
project: project:
name: "RetroArch" name: "RetroArch"

3
qb/config.libs.sh
View File

@ -284,7 +284,6 @@ if [ "$HAVE_QT" != 'no' ] && [ "$HAVE_MOC" = 'yes' ]; then
check_pkgconf QT5CONCURRENT Qt5Concurrent 5.2 check_pkgconf QT5CONCURRENT Qt5Concurrent 5.2
check_pkgconf QT5NETWORK Qt5Network 5.2 check_pkgconf QT5NETWORK Qt5Network 5.2
#check_pkgconf QT5WEBENGINE Qt5WebEngine 5.4 #check_pkgconf QT5WEBENGINE Qt5WebEngine 5.4
check_pkgconf OPENSSL openssl 1.0.0
# pkg-config is needed to reliably find Qt5 libraries. # pkg-config is needed to reliably find Qt5 libraries.
@ -295,6 +294,8 @@ if [ "$HAVE_QT" != 'no' ] && [ "$HAVE_MOC" = 'yes' ]; then
HAVE_QT=yes HAVE_QT=yes
fi fi
check_pkgconf OPENSSL openssl 1.0.0
#if [ "$HAVE_QT5WEBENGINE" = "no" ]; then #if [ "$HAVE_QT5WEBENGINE" = "no" ]; then
# die : 'Notice: Qt5WebEngine not found, disabling web browser support.' # die : 'Notice: Qt5WebEngine not found, disabling web browser support.'
#fi #fi