summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorscribam <scribam@users.noreply.github.com>2017-09-20 19:30:29 +0200
committerscribam <scribam@users.noreply.github.com>2017-09-20 23:28:56 +0200
commitfa3edace6a91fdd03f272993b1a30d762ee1221b (patch)
treecf6a9a442e52e1ae32c2a0f2ceca166a7396b24d
parenta7671fa2cdf0699508a1ee3dd568a8ef77f189fc (diff)
Fix travis BUILD
-rw-r--r--.travis.yml10
-rw-r--r--premake5.lua4
2 files changed, 10 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 14b1e1ab5..5f38ca6bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,17 +22,19 @@ 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
+ - libc++abi-dev
+ - libgtk-3-dev
+ - liblz4-dev
git:
# We handle submodules ourselves in xenia-build setup.
@@ -43,6 +45,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
# Prepare environment (pull dependencies, build tools).
- travis_retry ./xenia-build setup
diff --git a/premake5.lua b/premake5.lua
index 71b4e0043..b8d71b117 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -34,8 +34,8 @@ filter({})
characterset("Unicode")
flags({
- --"ExtraWarnings", -- Sets the compiler's maximum warning level.
- "FatalWarnings", -- Treat warnings as errors.
+ "ExtraWarnings", -- Sets the compiler's maximum warning level.
+ --"FatalWarnings", -- Treat warnings as errors.
})
filter("kind:StaticLib")