mirror of
https://github.com/RPCS3/rpcs3.git
synced 2024-11-22 10:42:36 +01:00
7aef811ff7
* CMake: Refactor build to multiple libraries - Refactor CMake build system by creating separate libraries for different components - Create interface libraries for most dependencies and add 3rdparty::* ALIAS targets for ease of use and use them to try specifying correct dependencies for each target - Prefer 3rdparty:: ALIAS when linking dependencies - Exclude xxHash subdirectory from ALL build target - Add USE_SYSTEM_ZLIB option to select between using included ZLib and the ZLib in CMake search path * Add cstring include to Log.cpp * CMake: Add 3rdparty::glew interface target * Add Visual Studio CMakeSettings.json to gitignore * CMake: Move building and finding LLVM to 3rdparty/llvm.cmake script - LLVM is now built under 3rdparty/ directory in the binary directory * CMake: Move finding Qt5 to 3rdparty/qt5.cmake script - Script has to be included in rpcs3/CMakeLists.txt because it defines Qt5::moc target which isn't available in that folder if it is included in 3rdparty directory - Set AUTOMOC and AUTOUIC properties for targets requiring them (rpcs3 and rpcs3_ui) instead of setting CMAKE_AUTOMOC and CMAKE_AUTOUIC so those properties are not defined for all targets under rpcs3 dir * CMake: Remove redundant code from rpcs3/CMakeLists.txt * CMake: Add BUILD_LLVM_SUBMODULE option instead of hardcoded check - Add BUILD_LLVM_SUBMODULE option (defaults to ON) to allow controlling usage of the LLVM submodule. - Move option definitions to root CMakeLists * CMake: Remove separate Emu subtargets - Based on discussion in pull request #5032, I decided to combine subtargets under Emu folder back to a single rpcs3_emu target * CMake: Remove utilities, loader and crypto targets: merge them to Emu - Removed separate targets and merged them into rpcs3_emu target as recommended in pull request (#5032) conversations. Separating targets probably later in a separate pull request * Fix relative includes in pad_thread.cpp * Fix Travis-CI cloning all submodules needlessly
34 lines
1.4 KiB
YAML
34 lines
1.4 KiB
YAML
language: cpp
|
|
matrix:
|
|
include:
|
|
- os: linux
|
|
env:
|
|
- NAME="Linux build"
|
|
- COMPILER="gcc"
|
|
dist: trusty
|
|
services: docker
|
|
cache: ccache
|
|
install: "docker pull rpcs3/rpcs3-travis-trusty:1.0"
|
|
script: 'docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache -e TRAVIS_PULL_REQUEST -e TRAVIS_BRANCH -e UPLOAD_URL -e COMPILER rpcs3/rpcs3-travis-trusty:1.0 /bin/bash -ex /rpcs3/.travis/build-linux.bash'
|
|
- os: linux
|
|
env:
|
|
- NAME="Linux build"
|
|
- COMPILER="clang"
|
|
- DEPLOY_APPIMAGE="true"
|
|
dist: trusty
|
|
services: docker
|
|
cache: ccache
|
|
install: "docker pull rpcs3/rpcs3-travis-trusty:1.0"
|
|
script: 'docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache -e TRAVIS_PULL_REQUEST -e TRAVIS_BRANCH -e TRAVIS_COMMIT -e COMPILER -e UPLOAD_URL -e DEPLOY_APPIMAGE rpcs3/rpcs3-travis-trusty:1.0 /bin/bash -ex /rpcs3/.travis/build-linux.bash'
|
|
- os: osx
|
|
osx_image: xcode10
|
|
script: "/bin/bash -ex .travis/build-mac.bash"
|
|
cache: ccache
|
|
# Unfortunately Requires MacOS 10.14 Mojave for latest c++ features, which Travis doesn't use yet
|
|
allow_failures:
|
|
- os: osx
|
|
|
|
git:
|
|
depth: false # Unshallow clone to obtain proper GIT_VERSION
|
|
submodules: false
|