Browse Source

For Travis CI - Revert back to always install ALSA for all platforms.
Straightly speaking ALSA is not required while cross-compiling to other non-Linux targets. However, in the CI build we have enabled Lua or LuaJIT and because of that we have to build some native tool(s). The problem is when configuring native project on a Linux build system, we could not inform our CMake script to ONLY configure for the tool building. Currently the script always attempt to configure most of things including SDL which in turns depends on ALSA, although actually the Lua tool building does not require it.
[ci package]

Yao Wei Tjong 姚伟忠 11 years ago
parent
commit
cda4637106
1 changed files with 1 additions and 1 deletions
  1. 1 1
      .travis.yml

+ 1 - 1
.travis.yml

@@ -55,7 +55,7 @@ before_install:
     - bash -c "( [ $SITE_UPDATE_ON_MASTER_COMMIT ] || [ $PACKAGE_UPLOAD ] )" && travis_retry sudo add-apt-repository ppa:george-edison55/precise-backports -y || true
     - travis_retry sudo apt-get update -q -y
 install:
-    - bash -c "[ $LINUX ]" && travis_retry sudo apt-get install -q -y --no-install-recommends libasound2-dev || true
+    - travis_retry sudo apt-get install -q -y --no-install-recommends libasound2-dev
     - bash -c "[ x$URHO3D_64BIT == 'x' ]" && travis_retry sudo apt-get remove -q -y gvfs-daemons && travis_retry sudo apt-get install -q -y libxrandr-dev:i386 libglapi-mesa:i386 libgl1-mesa-glx:i386 libgl1-mesa-dev:i386 libxext-dev:i386 libxrender-dev:i386 g++-multilib && export CMAKE_PREFIX_PATH=/usr/lib/i386-linux-gnu || true
     - bash -c "( [ $SITE_UPDATE_ON_MASTER_COMMIT ] || [ $PACKAGE_UPLOAD ] )" && travis_retry sudo apt-get install -q -y --no-install-recommends doxygen graphviz || true
     - bash -c "[ $WINDOWS ]" && travis_retry sudo apt-get install -q -y gcc-mingw-w64 gcc-mingw-w64-i686 gcc-mingw-w64-x86-64 g++-mingw-w64 g++-mingw-w64-i686 g++-mingw-w64-x86-64 binutils-mingw-w64 binutils-mingw-w64-i686 binutils-mingw-w64-x86-64 && export MINGW_PREFIX=/usr/bin/${ARCH}-w64-mingw32 || true