equal
deleted
inserted
replaced
57 hg clone http://hg.libsdl.org/SDL_mixer $SDL_LIB_PATH/SDL_mixer/ |
57 hg clone http://hg.libsdl.org/SDL_mixer $SDL_LIB_PATH/SDL_mixer/ |
58 fi |
58 fi |
59 |
59 |
60 install: | |
60 install: | |
61 if [ "$TRAVIS_OS_NAME" == "linux" ]; then |
61 if [ "$TRAVIS_OS_NAME" == "linux" ]; then |
62 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 |
62 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-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 |
63 elif [ "$TRAVIS_OS_NAME" == "osx" ]; then |
63 elif [ "$TRAVIS_OS_NAME" == "osx" ]; then |
64 brew install fpc glew qt physfs lua51 sdl2 sdl2_image sdl2_net sdl2_ttf ffmpeg ghc cabal-install |
64 brew install fpc glew qt physfs lua51 sdl2 sdl2_image sdl2_net sdl2_ttf ffmpeg ghc cabal-install |
65 brew install sdl2_mixer --with-libvorbis |
65 brew install sdl2_mixer --with-libvorbis |
66 # use cabal install haskell deps, pas2c ones are covered by server |
66 # use cabal install haskell deps, pas2c ones are covered by server |
67 if [[ "$BUILD_ARGS" != *"NOSERVER"* ]]; then |
67 if [[ "$BUILD_ARGS" != *"NOSERVER"* ]]; then |