summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-12-17 17:33:30 +0100
committerHowaner <franzi.moos@googlemail.com>2014-12-17 17:33:30 +0100
commit6ee7fd3c6792235c873e24b16331e3a8278021cc (patch)
tree707fb63ebda192bad5603c5c280d99746b510cc4 /.travis.yml
parentImplemented vanilla-like shift click. (diff)
parentMerge pull request #1674 from gushromp/master (diff)
downloadcuberite-6ee7fd3c6792235c873e24b16331e3a8278021cc.tar
cuberite-6ee7fd3c6792235c873e24b16331e3a8278021cc.tar.gz
cuberite-6ee7fd3c6792235c873e24b16331e3a8278021cc.tar.bz2
cuberite-6ee7fd3c6792235c873e24b16331e3a8278021cc.tar.lz
cuberite-6ee7fd3c6792235c873e24b16331e3a8278021cc.tar.xz
cuberite-6ee7fd3c6792235c873e24b16331e3a8278021cc.tar.zst
cuberite-6ee7fd3c6792235c873e24b16331e3a8278021cc.zip
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml6
1 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 4e8377748..26e74c1b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,9 +11,11 @@ before_install:
- sudo apt-get update -qq
install:
- # g++4.8
+ # g++4.8 and clang
- sudo apt-get install -qq g++-4.8
- - export CXX="g++-4.8"
+
+ # g++4.8
+ - if [ "$CXX" == "g++" ]; then export CXX="g++-4.8"; export CC="gcc-4.8"; fi
# Build MCServer
script: ./CIbuild.sh