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

Revert "WIP: travis: Enable building qt for linux." (#8039)

Browse Source
This commit is contained in:
orbea 2019-01-18 11:34:22 -08:00 committed by bparker06
parent a578146a9f
commit 79f8b6281f
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
.travis.yml
View File

@ -24,18 +24,22 @@ matrix:
- make - make
env: CROSS_COMPILE=x86_64-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501" env: CROSS_COMPILE=x86_64-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
- compiler: gcc - compiler: gcc
# Install a more recent gcc than the default
before_install:
- sudo apt-get install -y g++-7
- compiler: clang
# Install a more recent clang than the default
before_install:
- sudo apt-get install -y clang-3.8
addons: addons:
# Install a more recent gcc than the default
apt:
packages:
- g++-7
sources:
- ubuntu-toolchain-r-test
- compiler: clang
addons:
# Install a more recent clang than the default
apt: apt:
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
@ -61,20 +65,23 @@ script:
env: env:
global: global:
- MAKEFLAGS="-j2" - MAKEFLAGS="-j2"
- QT_SELECT=qt5
- secure: "qc91ReC3OlzSh2gFaSH6TYzC2qIQvgA2AZff6J13eaH8xijAhuMzttZ0rMQJ0DWCIhPeUb0kIzVyaGoe4MwPALzpw1C1AznIWiZJ53HN+hWCOcS/af7YVPk6HPySnwqrS+Wv3AIIvIKFV2mxv21F/JbT/N+pArlRrp904Xj+KPo=" - secure: "qc91ReC3OlzSh2gFaSH6TYzC2qIQvgA2AZff6J13eaH8xijAhuMzttZ0rMQJ0DWCIhPeUb0kIzVyaGoe4MwPALzpw1C1AznIWiZJ53HN+hWCOcS/af7YVPk6HPySnwqrS+Wv3AIIvIKFV2mxv21F/JbT/N+pArlRrp904Xj+KPo="
addons: addons:
apt: apt:
packages: packages:
- curl
- pkg-config
- libglu1-mesa-dev
- freeglut3-dev
- mesa-common-dev
- libsdl1.2-dev - libsdl1.2-dev
- libsdl-image1.2-dev - libsdl-image1.2-dev
- libsdl-mixer1.2-dev - libsdl-mixer1.2-dev
- libsdl-ttf2.0-dev - libsdl-ttf2.0-dev
- libusb-1.0-0-dev - libusb-1.0-0-dev
- qtbase5-dev - qt5-default
- qtdeclarative5-dev - qt5-qmake
sources: - qtbase5-dev-tools
- ubuntu-toolchain-r-test
coverity_scan: coverity_scan:
project: project:
name: "RetroArch" name: "RetroArch"

3
qb/config.libs.sh
View File

@ -284,6 +284,7 @@ if [ "$HAVE_QT" != 'no' ] && [ "$HAVE_CXX" != "no" ]; 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.
@ -294,8 +295,6 @@ if [ "$HAVE_QT" != 'no' ] && [ "$HAVE_CXX" != "no" ]; 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