diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-12-14 17:59:18 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-12-14 18:27:56 +0100 |
| commit | ab9cda1497e7bed41b474a0ab8a2a4b0547dd916 (patch) | |
| tree | 8e3515be7ebefa45e2ea314a882be61c3bc573d8 /.travis.yml | |
| parent | b872439eefb7d54a572ace3a57fea01787c46952 (diff) | |
| download | redot-engine-ab9cda1497e7bed41b474a0ab8a2a4b0547dd916.tar.gz | |
openmp: Don't try to link GCC's implementation on Clang
Also disable openmp build on Travis, breaks on Trusty's Clang.
Group deps more naturally.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index c11a21aeef..0dfeaf16e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,14 +48,14 @@ addons: - pkg-config - libx11-dev - libxcursor-dev - - libasound2-dev - - libfreetype6-dev + - libxi-dev + - libxinerama-dev + - libxrandr-dev - libgl1-mesa-dev - libglu1-mesa-dev + - libasound2-dev + - libfreetype6-dev - libssl-dev - - libxinerama-dev - - libxrandr-dev - - libxi-dev # For cross-compiling to Windows. #- binutils-mingw-w64-i686 @@ -90,5 +90,5 @@ script: - if [ "$STATIC_CHECKS" = "yes" ]; then sh ./misc/travis/clang-format.sh; else - scons -j2 CC=$CC CXX=$CXX platform=$GODOT_TARGET TOOLS=$TOOLS verbose=yes progress=no; + scons -j2 CC=$CC CXX=$CXX platform=$GODOT_TARGET TOOLS=$TOOLS verbose=yes progress=no openmp=no; fi |