summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorKenneth Mortensen <kmo@protelevision.com>2017-12-11 11:07:53 +0100
committerKenneth Mortensen <kmo@protelevision.com>2017-12-11 11:07:53 +0100
commitbaf3f64d01136e3a1e272d9a0e93ced59a27354e (patch)
treedf0650d8aa671b8fac141f96f94b07c7f72eb123 /.travis.yml
parente3c95fbeb8f29db76c8c95ac8c4984c6126cce3e (diff)
parent8d4c21193437882c7cb4cb8245aa80f9d8d7c084 (diff)
downloadetisnoop-baf3f64d01136e3a1e272d9a0e93ced59a27354e.tar.gz
etisnoop-baf3f64d01136e3a1e272d9a0e93ced59a27354e.tar.bz2
etisnoop-baf3f64d01136e3a1e272d9a0e93ced59a27354e.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml12
1 files changed, 2 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml
index ac4efd1..2a933e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,6 @@ language: c++
sudo: required
dist: trusty
-compiler:
- - gcc
-
addons: &addons
apt:
sources: &sources
@@ -12,7 +9,6 @@ addons: &addons
packages: &packages
- libzmq3-dev
- libzmq3
- - libboost1.55-all-dev
- libfaad-dev
- libfaad2
- automake
@@ -24,15 +20,11 @@ script:
CC=gcc-6 CXX=g++-6 ./configure
make
- |
- ./bootstrap.sh
- ./configure
- make
- - |
wget http://downloads.sourceforge.net/faac/faad2-2.7.tar.bz2
tar -f faad2-2.7.tar.bz2 -x
cd faad2-2.7
- ./configure
+ CC=gcc-6 CXX=g++-6 ./configure
make
cd ..
- make -f Makefile.faadalyse
+ make CC=gcc-6 CXX=g++-6 -f Makefile.faadalyse