Try and re-enable travis builds

This commit is contained in:
Dr. Chat 2017-02-05 20:21:35 -06:00
parent 65ca7fc416
commit 2b8698d6e2
2 changed files with 12 additions and 10 deletions

View File

@ -23,22 +23,22 @@ addons:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
# - llvm-toolchain-precise - llvm-toolchain-precise
packages: packages:
# - clang-3.8 - clang-3.8
# - clang-format-3.8 - clang-format-3.8
- libc++-dev
git: git:
# We handle submodules ourselves in xenia-build setup. # We handle submodules ourselves in xenia-build setup.
submodules: false submodules: false
before_install: before_install:
- wget http://llvm.org/releases/$LLVM_VERSION/clang+llvm-$LLVM_VERSION-x86_64-linux-gnu-ubuntu-14.04.tar.xz -O $LLVM_ARCHIVE_PATH # Nothing!
- mkdir $HOME/clang+llvm
- tar xf $LLVM_ARCHIVE_PATH -C $HOME/clang+llvm --strip-components 1
- export PATH=$HOME/clang+llvm/bin:$PATH
before_script: before_script:
- export CXX=clang++-3.8
- export CC=clang-3.8
# Dump useful info. # Dump useful info.
- $CXX --version - $CXX --version
# Prepare environment (pull dependencies, build tools). # Prepare environment (pull dependencies, build tools).
@ -49,10 +49,11 @@ script:
- ./xenia-build lint --all - ./xenia-build lint --all
# Run style checker. # Run style checker.
#- ./xenia-build style #- ./xenia-build style
# TODO(DrChat): Enable builds in the future.
# Build and run our simple hello world test. # Build and run our simple hello world test.
# - ./xenia-build build --config=debug --target=xenia-base-tests - ./xenia-build build --config=debug --target=xenia-base-tests
# - ./build/bin/Linux/Debug/xenia-base-tests - ./build/bin/Linux/Debug/xenia-base-tests
# TODO(DrChat): Enable builds in the future.
# Build all of xenia. # Build all of xenia.
#- ./xenia-build build --config=debug #- ./xenia-build build --config=debug
# All tests (without haswell support). # All tests (without haswell support).

View File

@ -80,6 +80,7 @@ filter("platforms:Linux")
filter({"platforms:Linux", "language:C++"}) filter({"platforms:Linux", "language:C++"})
buildoptions({ buildoptions({
"-std=c++14", "-std=c++14",
"-stdlib=libc++",
}) })
filter("platforms:Windows") filter("platforms:Windows")