Skip to content
Snippets Groups Projects
Commit 5cceda37 authored by Alam Ed Arias's avatar Alam Ed Arias
Browse files

Merge branch 'master' into build-modes

parents 56331d86 6f4c52c9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
.travis.yml
+ 2
− 2
View file @ 5cceda37
...@@ -98,7 +98,7 @@ matrix: ...@@ -98,7 +98,7 @@ matrix:
- p7zip-full - p7zip-full
- gcc-6 - gcc-6
compiler: gcc-6 compiler: gcc-6
env: WFLAGS="-Wno-error=tautological-compare" env: WFLAGS="-Wno-tautological-compare"
#gcc-6 (Ubuntu 6.1.1-3ubuntu11~14.04.1) 6.1.1 20160511 #gcc-6 (Ubuntu 6.1.1-3ubuntu11~14.04.1) 6.1.1 20160511
- os: linux - os: linux
compiler: clang compiler: clang
...@@ -213,7 +213,7 @@ before_script: ...@@ -213,7 +213,7 @@ before_script:
- 7z x $HOME/srb2_cache/SRB2-v2115-assets-2.7z -oassets - 7z x $HOME/srb2_cache/SRB2-v2115-assets-2.7z -oassets
- mkdir build - mkdir build
- cd build - cd build
- export CFLAGS="-Wall -W $WFLAGS" - export CFLAGS="-Wall -W -Werror $WFLAGS"
- export CCACHE_COMPRESS=true - export CCACHE_COMPRESS=true
- cmake .. -DCMAKE_BUILD_TYPE=Release - cmake .. -DCMAKE_BUILD_TYPE=Release
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment