Merge branch 'linux' of git://github.com/dougvj/xenia into linux

# Conflicts:
#	.travis.yml
This commit is contained in:
DrChat
2017-12-14 19:20:02 -06:00
45 changed files with 2214 additions and 369 deletions

View File

@@ -22,18 +22,20 @@ matrix:
# LLVMGold.so is not installed correctly
- env: BUILD=true CONFIG=Release
dist: trusty
sudo: required
addons:
apt:
sources:
# - ubuntu-toolchain-r-test
- llvm-toolchain-precise
- llvm-toolchain-trusty
packages:
- clang-3.8
- clang-format-3.8
- libc++-dev
- python3
- libc++abi-dev
- libgtk-3-dev
- liblz4-dev
git:
# We handle submodules ourselves in xenia-build setup.
@@ -44,6 +46,10 @@ before_script:
- export CC=clang-3.8
# Dump useful info.
- $CXX --version
# Add Vulkan dependencies
- wget http://mirrors.kernel.org/ubuntu/pool/universe/v/vulkan/libvulkan1_1.0.42.0+dfsg1-1ubuntu1~16.04.1_amd64.deb
- wget http://mirrors.kernel.org/ubuntu/pool/universe/v/vulkan/libvulkan-dev_1.0.42.0+dfsg1-1ubuntu1~16.04.1_amd64.deb
- sudo dpkg -i libvulkan1_1.0.42.0+dfsg1-1ubuntu1~16.04.1_amd64.deb libvulkan-dev_1.0.42.0+dfsg1-1ubuntu1~16.04.1_amd64.deb
- python3 --version
# Prepare environment (pull dependencies, build tools).
- travis_retry ./xenia-build setup