desura
/
Desurium
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

travis/readme/install_deps: travis2 changes 

v2: ubuntu usedy by travis-ci doesn't know tinyxml2
master
Smilex 2013-07-15 17:29:59 +01:00 committed by Karol Herbst
parent cc97fcdde3
commit e4cc432d4b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -2,7 +2,7 @@ language: cpp
compiler: gcc
before_install:
- sudo apt-get update
- sudo apt-get install gcc-multilib libnotify-dev libtinyxml-dev libv8-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-thread-dev libboost-system-dev libboost-test-dev
- sudo apt-get install gcc-multilib libnotify-dev libv8-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-thread-dev libboost-system-dev libboost-test-dev
- wget "http://ppa.launchpad.net/fransschreuder1/usbpicprog-stable/ubuntu/pool/main/w/wxwidgets2.9/libwxgtk2.9-dev_2.9.3-1_amd64.deb"
- wget "http://ppa.launchpad.net/fransschreuder1/usbpicprog-stable/ubuntu/pool/main/w/wxwidgets2.9/wx2.9-headers_2.9.3-1_amd64.deb"
- wget "http://ppa.launchpad.net/fransschreuder1/usbpicprog-stable/ubuntu/pool/main/w/wxwidgets2.9/libwxgtk2.9-0_2.9.3-1_amd64.deb"
@ -17,7 +17,7 @@ before_script:
- mkdir build
- cd build
script:
- cmake .. -DBUILD_CEF=off -DWITH_ARES=off -DFORCE_SYS_DEPS=on -DDEBUG=on -DFORCE_BUNDLED_WXGTK=off
- cmake .. -DBUILD_CEF=off -DWITH_ARES=off -DDEBUG=on -DFORCE_BUNDLED_WXGTK=off
- make -j4
- ctest --output-on-failure .
notifications:

2
README.md
View File

@ -37,7 +37,7 @@ Required dependencies:
* OpenSSL (only for building Curl)
* BZip2
* Sqlite3
* tinyxml (2.6 or later)
* tinyxml2
* V8
* Python
* C-ares

2
install_deps.sh
View File

@ -9,7 +9,7 @@ fi
if [ -f /etc/debian_version ]; then # Debian (untested!)
echo -e "\e[1;31mDebian detected!\e[0m"
echo -e "\e[1;31mNote: you can build a DEB package running './build_desura.sh pack_deb'\e[0m"
DEPS="autoconf automake binutils bison build-essential cmake flex gcc gperf libasound2-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-system-dev libboost-test-dev libboost-thread-dev libbz2-dev libc-ares-dev libcups2-dev libdbus-glib-1-dev libevent-dev libflac-dev libgconf2-dev libgnome-keyring-dev libgtk2.0-dev libjpeg62-dev libnotify-dev libnss3-dev libpng12-dev libspeex-dev libsqlite3-dev libssl-dev libtinyxml-dev libtool libv8-dev libx11-dev libxml2-dev libxpm-dev libxslt1-dev m4 scons xdg-utils yasm libxt-dev"
DEPS="autoconf automake binutils bison build-essential cmake flex gcc gperf libasound2-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-system-dev libboost-test-dev libboost-thread-dev libbz2-dev libc-ares-dev libcups2-dev libdbus-glib-1-dev libevent-dev libflac-dev libgconf2-dev libgnome-keyring-dev libgtk2.0-dev libjpeg62-dev libnotify-dev libnss3-dev libpng12-dev libspeex-dev libsqlite3-dev libssl-dev libtinyxml2-dev libtool libv8-dev libx11-dev libxml2-dev libxpm-dev libxslt1-dev m4 scons xdg-utils yasm libxt-dev"
if [ `uname -m` = 'x86_64' ]; then # 64 bit dependencies for 32BIT_SUPPORT
DEPS=$DEPS" libc6-dev-i386 gcc-multilib"
fi