From c70ac21da4d97f35205df4d396dbbf280beeecd1 Mon Sep 17 00:00:00 2001
From: Tim Warren <timothy.warren@11main.com>
Date: Mon, 1 Jun 2015 09:34:26 -0400
Subject: [PATCH] Another try at fixing travis build

---
 .travis.yml | 2 +-
 Makefile    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9e31b16..34837d8 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ before_install:
     # Upgrade gcc
     - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
     - sudo apt-get -qq update 
-    - sudo apt-get -qq install g++-4.8
+    - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 98
     
     # Install dependencies
     - sudo apt-get -qq install libwxgtk3.0-dev libwxgtk3.0-0 libssh2-1-dev
diff --git a/Makefile b/Makefile
index 0e1ffda..eb565fe 100644
--- a/Makefile
+++ b/Makefile
@@ -45,12 +45,12 @@ endif
 
 ifeq ($(OS),Windows_NT)
 	CXXFLAGS += -static
-	CXX += -std=gnu++11 -Wno-unknown-pragmas -Wno-missing-field-initializers -I/include -DWIN32
+	CXX += -std=gnu++11 -Wno-unknown-pragmas -Wno-missing-field-initializers -DWIN32
 	LDLIBS += -L/lib -lwsock32
 endif
 
 ifeq ($(OS),Linux)
-	CXX += -std=c++11
+	CXX += -std=c++11 -Wno-unknown-pragmas -Wno-missing-field-initializers
 endif
 
 CXX += -Iinclude -I. -I/usr/local/include