equal
deleted
inserted
replaced
64 hg clone http://hg.libsdl.org/SDL_mixer $SDL_LIB_PATH/SDL_mixer/ |
64 hg clone http://hg.libsdl.org/SDL_mixer $SDL_LIB_PATH/SDL_mixer/ |
65 fi |
65 fi |
66 |
66 |
67 install: | |
67 install: | |
68 if [ "$TRAVIS_OS_NAME" == "linux" ]; then |
68 if [ "$TRAVIS_OS_NAME" == "linux" ]; then |
69 sudo apt-get install -y 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-network-dev libghc-sandi-dev libghc-hslogger-dev libghc-utf8-string-dev libghc-sha-dev libghc-entropy-dev libghc-regex-tdfa-dev liblua5.1-0-dev imagemagick fpc fp-compiler fp-units-misc libpng-dev fp-units-gfx libavcodec-dev libavformat-dev libglew1.6-dev |
69 sudo apt-get install -y debhelper cmake dpkg-dev qtbase5-dev qtbase5-private-dev qt5-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-network-dev libghc-sandi-dev libghc-hslogger-dev libghc-utf8-string-dev libghc-sha-dev libghc-entropy-dev libghc-regex-tdfa-dev liblua5.1-0-dev imagemagick fpc fp-compiler fp-units-misc libpng-dev fp-units-gfx libavcodec-dev libavformat-dev libglew1.6-dev |
70 elif [ "$TRAVIS_OS_NAME" == "osx" ]; then |
70 elif [ "$TRAVIS_OS_NAME" == "osx" ]; then |
71 brew tap cartr/qt4 |
71 brew install qt5 |
72 brew tap-pin cartr/qt4 |
|
73 brew install qt@4 |
|
74 brew install fpc glew physfs lua51 sdl2 sdl2_image sdl2_net sdl2_ttf ffmpeg ghc cabal-install |
72 brew install fpc glew physfs lua51 sdl2 sdl2_image sdl2_net sdl2_ttf ffmpeg ghc cabal-install |
75 brew install sdl2_mixer --with-libvorbis |
73 brew install sdl2_mixer --with-libvorbis |
76 # use cabal install haskell deps, pas2c ones are covered by server |
74 # use cabal install haskell deps, pas2c ones are covered by server |
77 if [[ "$BUILD_ARGS" != *"NOSERVER"* ]]; then |
75 if [[ "$BUILD_ARGS" != *"NOSERVER"* ]]; then |
78 cabal update |
76 cabal update |