From 8c5fe1c7e4717d57033563824c40db659776459a Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Tue, 14 Apr 2015 12:53:58 -0400 Subject: [PATCH] SFTP Makefile fixes --- Makefile | 6 +++--- src/network/SFTP.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 984ab4d..53debac 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ -CXX = $(shell wx-config --cxx) +CXX = $(shell wx-config --cxx) -I/include -SOURCES = $(wildcard include/**/*.cpp src/settings/*.cpp include/*.cpp) +SOURCES = $(wildcard include/**/*.cpp src/network/*.cpp src/settings/*.cpp include/*.cpp) OBJECTS = $(patsubst %.cpp,%.o, $(SOURCES)) TARGET = build/Tyro.a @@ -10,7 +10,7 @@ PROGRAM_OBJECTS = $(patsubst %.cpp,%.o, $(PROGRAM_SRC)) BASE_FLAGS = -DSCI_LEXER -LDLIBS = $(TARGET) $(shell wx-config --libs base core aui stc adv) +LDLIBS = $(TARGET) $(shell wx-config --libs base core aui stc adv) -lssh2 WX_CXXFLAGS = $(shell wx-config --cxxflags) $(BASE_FLAGS) DEV_CXXFLAGS = -g -Wall -Wextra CXXFLAGS = -Os diff --git a/src/network/SFTP.h b/src/network/SFTP.h index 0926164..058609d 100644 --- a/src/network/SFTP.h +++ b/src/network/SFTP.h @@ -14,7 +14,7 @@ #include #ifdef WIN32 - #include + #include #else #include #include