RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-25 20:22:30 +01:00
Code Issues Releases Wiki Activity

Bump version built on to 16.04, Update clang to 8, update Qt to 5.12.3

Browse Source
This commit is contained in:
Zion 2019-06-19 19:58:46 -07:00 committed by Ivan
parent 00bc3fe658
commit f1d474f932
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.travis.yml
View File

@ -7,17 +7,18 @@ matrix:
# - COMPILER="gcc" # - COMPILER="gcc"
# services: docker # services: docker
# cache: ccache # cache: ccache
# install: "docker pull rpcs3/rpcs3-travis-trusty:1.1" # install: "docker pull rpcs3/rpcs3-travis-xenial:1.0"
# script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache --env-file .travis/travis.env rpcs3/rpcs3-travis-trusty:1.1 /bin/bash -ex /rpcs3/.travis/build-linux.bash' # script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache --env-file .travis/travis.env rpcs3/rpcs3-travis-xenial:1.0 /bin/bash -ex /rpcs3/.travis/build-linux.bash'
- os: linux - os: linux
dist: xenial
env: env:
- NAME="Linux build" - NAME="Linux build"
- COMPILER="clang" - COMPILER="clang"
- DEPLOY_APPIMAGE="true" - DEPLOY_APPIMAGE="true"
services: docker services: docker
cache: ccache cache: ccache
install: "docker pull rpcs3/rpcs3-travis-trusty:1.1" install: "docker pull rpcs3/rpcs3-travis-xenial:1.0"
script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache --env-file .travis/travis.env rpcs3/rpcs3-travis-trusty:1.1 /bin/bash -ex /rpcs3/.travis/build-linux.bash' script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache --env-file .travis/travis.env rpcs3/rpcs3-travis-xenial:1.0 /bin/bash -ex /rpcs3/.travis/build-linux.bash'
- os: osx - os: osx
osx_image: xcode10.2 osx_image: xcode10.2
addons: addons:

2
.travis/deploy-linux.bash
View File

@ -13,7 +13,7 @@ if [ "$DEPLOY_APPIMAGE" = "true" ]; then
cp $(readlink -f /lib/x86_64-linux-gnu/libnsl.so.1) ./appdir/usr/lib/libnsl.so.1 cp $(readlink -f /lib/x86_64-linux-gnu/libnsl.so.1) ./appdir/usr/lib/libnsl.so.1
export PATH=/rpcs3/build/squashfs-root/usr/bin/:${PATH} export PATH=/rpcs3/build/squashfs-root/usr/bin/:${PATH}
# Embed newer libstdc++ for distros that don't come with it (ubuntu 14.04, 16.04) # Embed newer libstdc++ for distros that don't come with it (ubuntu 16.04)
mkdir -p appdir/usr/optional/ ; mkdir -p appdir/usr/optional/libstdc++/ mkdir -p appdir/usr/optional/ ; mkdir -p appdir/usr/optional/libstdc++/
cp /usr/lib/x86_64-linux-gnu/libstdc++.so.6 ./appdir/usr/optional/libstdc++/ cp /usr/lib/x86_64-linux-gnu/libstdc++.so.6 ./appdir/usr/optional/libstdc++/
rm ./appdir/AppRun rm ./appdir/AppRun

5
rpcs3/Emu/CMakeLists.txt
View File

@ -11,6 +11,11 @@ target_link_libraries(rpcs3_emu
PUBLIC PUBLIC
3rdparty::libevdev) 3rdparty::libevdev)
find_package(Threads REQUIRED)
target_link_libraries(rpcs3_emu
PUBLIC Threads::Threads)
# For stdafx.h # For stdafx.h
target_include_directories(rpcs3_emu target_include_directories(rpcs3_emu
PUBLIC PUBLIC