Install alsa. Drop Clang. Drop PNG

This commit is contained in:
nabijaczleweli 2016-01-28 13:07:13 +01:00
parent 43a1d7a0fe
commit 28d0efeed4
No known key found for this signature in database
GPG Key ID: BCFD0B018D2658F1

View File

@ -14,7 +14,9 @@ matrix:
packages: packages:
- g++-5 - g++-5
- libjpeg8-dev - libjpeg8-dev
- libpng-dev - libasound2-dev
- alsa-utils
- alsa-oss
sources: &sources sources: &sources
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-precise - llvm-toolchain-precise
@ -26,31 +28,9 @@ matrix:
packages: packages:
- g++-4.9 - g++-4.9
- libjpeg8-dev - libjpeg8-dev
- libpng-dev - libasound2-dev
sources: *sources - alsa-utils
- env: CXX=clang++-3.8 CC=clang-3.8 - alsa-oss
addons:
apt:
packages:
- clang-3.8
- libjpeg8-dev
- libpng-dev
sources: *sources
- env: CXX=clang++-3.7 CC=clang-3.7
addons:
apt:
packages:
- clang-3.7
- libjpeg8-dev
- libpng-dev
sources: *sources
- env: CXX=clang++-3.6 CC=clang-3.6
addons:
apt:
packages:
- clang-3.6
- libjpeg8-dev
- libpng-dev
sources: *sources sources: *sources
before_install: before_install:
@ -67,5 +47,5 @@ before_script :
- cd bld - cd bld
script: script:
- cmake -G"Unix Makefiles" .. -DENABLE_JPEG=ON -DENABLE_PNG=ON - cmake -G"Unix Makefiles" .. -DENABLE_JPEG=ON
- make - make