timw4mail/Tyro
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Re-order include paths, attempting to fix travis build

Browse Source
This commit is contained in:
Tim Warren 2015-06-01 15:29:17 -04:00
parent 743ef0e616
commit 289d52489b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

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