Merge commit 'eda183287489b2c705843aa373a19c4e46fb2fec'

* commit 'eda183287489b2c705843aa373a19c4e46fb2fec':
  travis: Enable OSX integration

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2015-11-22 17:12:24 +00:00
commit df8e24be5d

View File

@ -1,5 +1,8 @@
language: c language: c
sudo: false sudo: false
os:
- linux
- osx
addons: addons:
apt: apt:
packages: packages:
@ -11,6 +14,10 @@ compiler:
cache: cache:
directories: directories:
- ffmpeg-samples - ffmpeg-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: script:
- mkdir -p ffmpeg-samples - mkdir -p ffmpeg-samples
- ./configure --samples=ffmpeg-samples --cc=$CC - ./configure --samples=ffmpeg-samples --cc=$CC