Travis: Remove x86 build for now, use g++ 4.8

.travis.yml

@@ -1,35 +1,15 @@
 matrix:
   include:
-    - os: linux
-      sudo: required
-      env: TARGET_CPU=x86
-
-    - os: linux
-      sudo: required
-      env: TARGET_CPU=x86 CMAKE_BUILD_TYPE=Debug
-
     - os: linux
       sudo: required
       env: TARGET_CPU=x64
-
-    - os: linux
-      sudo: required
-      env: TARGET_CPU=x64 CMAKE_BUILD_TYPE=Debug
-
-    - os: osx
-      osx_image: xcode7.3
-      env: TARGET_CPU=x64
-
-    - os: osx
-      osx_image: xcode7.3
-      env: TARGET_CPU=x64 CMAKE_BUILD_TYPE=Debug
-
-language: cpp
-
-addons:
-  apt:
+      addons:
+        apt: &x64-apt
+          sources:
+          - ubuntu-toolchain-r-test
           packages:
-    - build-essential
+          - gcc-4.8
+          - g++-4.8
           - libglib2.0-dev
           - libgtk2.0-dev
           - libxtst-dev
@@ -43,6 +23,26 @@ addons:
           - libpulse-dev
           - libudev-dev
 
+    - os: linux
+      sudo: required
+      env: TARGET_CPU=x64 CMAKE_BUILD_TYPE=Debug
+      addons:
+        apt: *x64-apt
+
+    - os: osx
+      osx_image: xcode7.3
+      env: TARGET_CPU=x64
+      addons:
+        apt: *x64-apt
+
+    - os: osx
+      osx_image: xcode7.3
+      env: TARGET_CPU=x64 CMAKE_BUILD_TYPE=Debug
+      addons:
+        apt: *x64-apt
+
+language: cpp
+
 before_install:
 - DEPS_DIR="${TRAVIS_BUILD_DIR}/deps"
 - mkdir -p ${DEPS_DIR} && cd ${DEPS_DIR}
@@ -51,6 +51,7 @@ before_install:
     CMAKE_URL="http://www.cmake.org/files/v3.5/cmake-3.5.2-Linux-x86_64.tar.gz"
     mkdir cmake && travis_retry wget --no-check-certificate --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake
     export PATH=${DEPS_DIR}/cmake/bin:${PATH}
+    export CXX="g++-4.8" CC="gcc-4.8"
   else
     if ! brew ls --version cmake &>/dev/null; then brew update && brew install cmake; fi
   fi