From 1e56715f5b021b8035bdca6e7273a3aeea6b81d6 Mon Sep 17 00:00:00 2001 From: Tim Warren Date: Mon, 22 Jun 2015 09:46:01 -0400 Subject: [PATCH] Will it build now?! --- .travis.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f4e296c..b4cb92a 100755 --- a/.travis.yml +++ b/.travis.yml @@ -4,13 +4,9 @@ language: cpp before_install: # Define TRAVIS variable for workarounds - export CXXFLAGS="$CXXFLAGS -DTRAVIS" - - sudo apt-get -qq update - - # Install dependencies - - sudo apt-get -qq install libwxgtk3.0-dev libwxgtk3.0-0 libssh2-1-dev install: - - if [ "$CXX" = "g++" ]; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 98; fi + - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi # Build with both gcc and clang compiler: @@ -25,5 +21,8 @@ addons: - gcc-4.8 - g++-4.8 - clang + - libwxgtk3.0-dev + - libwxgtk3.0-0 + - libssh2-1-dev script: make clean run-tests