From 289d52489b88562ea7a87253fe583e7e313a0a6e Mon Sep 17 00:00:00 2001
From: Tim Warren <timothy.warren@11main.com>
Date: Mon, 1 Jun 2015 15:29:17 -0400
Subject: [PATCH] Re-order include paths, attempting to fix travis build

---
 Makefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 93c4ce8..37b5b0d 100644
--- a/Makefile
+++ b/Makefile
@@ -18,8 +18,9 @@ WIDGET_LIB = build/widget.a
 WX_RES = $(shell wx-config --rescomp)
 WX_CXXFLAGS =  $(shell wx-config --cxxflags)
 
-DEV_CXXFLAGS = -g -Wall -Wextra -DDEBUG
-CXXFLAGS = -Os -DNDEBUG
+INC_FLAGS = -Iinclude -I. -I/usr/local/include
+DEV_CXXFLAGS = -g -Wall -Wextra -DDEBUG $(INC_FLAGS)
+CXXFLAGS = -Os -DNDEBUG $(INC_FLAGS)
 
 TEST_SRC = $(wildcard tests/*.cpp)
 TESTS = $(patsubst %.cpp,%,$(TEST_SRC))
@@ -53,8 +54,6 @@ ifeq ($(OS),Linux)
 	CXX += -std=c++11 -Wno-unknown-pragmas -Wno-missing-field-initializers
 endif
 
-CXX += -Iinclude -I. -I/usr/local/include
-
 ifdef $(DEV)
 all: CXXFLAGS = $(DEV_CXXFLAGS)
 endif