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

Fix clang build on Travis

Browse Source
This commit is contained in:
Timothy Warren 2015-05-08 22:20:59 -04:00
parent 3feb4d60de
commit 452b2c34a7
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -31,15 +31,20 @@ endif
ifeq ($(OS),Darwin) ifeq ($(OS),Darwin)
CXX = $(shell wx-config --cxx) CXX = $(shell wx-config --cxx)
LDLIBS += /usr/local/lib/libssh2.a LDLIBS += /usr/local/lib/libssh2.a
endif else
ifeq ($(OS),Linux)
CXX += -std=c++11
LDLIBS += -lssh2 LDLIBS += -lssh2
endif endif
ifeq ($(OS),Linux)
ifeq ($(CXX),clang++)
CXX += -std=c++11 -Wno-potentially-evaluated-expression
endif
endif
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
CXXFLAGS += -static CXXFLAGS += -static
CXX += -I/include -DWIN32 CXX += -I/include -DWIN32
LDLIBS += -L/lib -lwsock32 -lssh2 LDLIBS += -L/lib -lwsock32
endif endif
CXX += -Iinclude -I. -I/usr/local/include CXX += -Iinclude -I. -I/usr/local/include