git.videolan.org
/
ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
configure: Fix typo in objcc default setting
[ffmpeg.git]
/
.travis.yml
diff --git
a/.travis.yml
b/.travis.yml
index
6a9b624
..
8e9629a
100644
(file)
--- a/
.travis.yml
+++ b/
.travis.yml
@@
-1,16
+1,23
@@
language: c
sudo: false
language: c
sudo: false
+os:
+ - linux
+ - osx
addons:
apt:
packages:
- yasm
addons:
apt:
packages:
- yasm
- -
bc
+ -
diffutils
compiler:
- clang
- gcc
cache:
directories:
- libav-samples
compiler:
- clang
- gcc
cache:
directories:
- libav-samples
+before_install:
+ - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update --all; fi
+install:
+ - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install yasm; fi
script:
- mkdir -p libav-samples
- ./configure --samples=libav-samples --cc=$CC
script:
- mkdir -p libav-samples
- ./configure --samples=libav-samples --cc=$CC