travis: Use correct vorbis flag in sdl2_mixer install
authorkoda
Thu, 21 Apr 2016 16:03:57 -0400
changeset 11667 97a4188fc99e
parent 11666 7d483d400f8d
child 11668 0427a9b6457b
travis: Use correct vorbis flag in sdl2_mixer install Revert the addition of cmake which is already instealled.
.travis.yml
--- a/.travis.yml	Thu Apr 21 14:16:47 2016 -0400
+++ b/.travis.yml	Thu Apr 21 16:03:57 2016 -0400
@@ -43,8 +43,8 @@
   elif [ "$TRAVIS_OS_NAME" == "linux" ]; then
     sudo apt-get install debhelper cmake dpkg-dev libqt4-dev qt4-qmake libphysfs-dev libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libsdl2-image-dev libsdl2-net-dev bzip2 ghc libghc-mtl-dev libghc-parsec3-dev libghc-bytestring-show-dev libghc-vector-dev libghc-zlib-dev libghc-random-dev libghc-stm-dev libghc-network-dev libghc-dataenc-dev libghc-hslogger-dev libghc-utf8-string-dev libghc-sha-dev libghc-entropy-dev liblua5.1-0-dev imagemagick fpc fp-compiler fp-units-misc libpng-dev fp-units-gfx libavcodec-dev libavformat-dev libglew1.6-dev
   elif [ "$TRAVIS_OS_NAME" == "osx" ]; then
-    brew install fpc glew qt physfs lua51 sdl2 sdl2_image sdl2_net sdl2_ttf ffmpeg ghc cabal-install cmake
-    brew install sdl2_mixer --with-vorbis
+    brew install fpc glew qt physfs lua51 sdl2 sdl2_image sdl2_net sdl2_ttf ffmpeg ghc cabal-install
+    brew install sdl2_mixer --with-libvorbis
     # use cabal install haskell deps, pas2c ones are covered by server
     if [[ "$BUILD_ARGS" != *"NOSERVER"* ]]; then
       cabal update