diff options
| author | Ferenc Arn <tagcup@yahoo.com> | 2017-04-26 10:49:08 -0500 |
|---|---|---|
| committer | Ferenc Arn <tagcup@yahoo.com> | 2017-05-31 18:59:00 -0500 |
| commit | 6a9c990da72a737fa95d9e97d53f835706aea7c3 (patch) | |
| tree | 0f5c1d36279bef5d0d5c84fc1d3fb24256b65ba8 /.travis.yml | |
| parent | bd26fa7bf2bf02f9ef17ad4ef3a93ffed3ffcf56 (diff) | |
| download | redot-engine-6a9c990da72a737fa95d9e97d53f835706aea7c3.tar.gz | |
Add ETC1/ETC2 compression support though etc2comp.
Remove rg-etc1 code. Also updated travis to use ubuntu 14.04.
Fixes #8457.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 6be9f1f603..12d49f5d5d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ language: cpp +dist: trusty + sudo: false compiler: @@ -73,7 +75,6 @@ addons: # For style checks. - clang-format-3.9 - before_script: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; brew install scons; fi - if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "$GODOT_TARGET" = "android" ]; then @@ -86,5 +87,9 @@ script: - if [ "$STATIC_CHECKS" = "yes" ]; then sh ./misc/travis/clang-format.sh; else - scons platform=$GODOT_TARGET CXX=$CXX openssl=builtin; + if [ "$TRAVIS_OS_NAME" = "windows" ]; then + scons platform=$GODOT_TARGET CXX=$CXX openssl=builtin; + else + scons platform=$GODOT_TARGET bits=64 CXX=$CXX openssl=builtin; + fi fi |