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

SFTP Makefile fixes

Browse Source
This commit is contained in:
Timothy Warren 2015-04-14 12:53:58 -04:00
parent d6212be16d
commit 8c5fe1c7e4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -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)) OBJECTS = $(patsubst %.cpp,%.o, $(SOURCES))
TARGET = build/Tyro.a TARGET = build/Tyro.a
@ -10,7 +10,7 @@ PROGRAM_OBJECTS = $(patsubst %.cpp,%.o, $(PROGRAM_SRC))
BASE_FLAGS = -DSCI_LEXER 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) WX_CXXFLAGS = $(shell wx-config --cxxflags) $(BASE_FLAGS)
DEV_CXXFLAGS = -g -Wall -Wextra DEV_CXXFLAGS = -g -Wall -Wextra
CXXFLAGS = -Os CXXFLAGS = -Os

2
src/network/SFTP.h
View File

@ -14,7 +14,7 @@
#include <cstring> #include <cstring>
#ifdef WIN32 #ifdef WIN32
#include <winsock2.h> #include <Ws2tcpip.h>
#else #else
#include <sys/socket.h> #include <sys/socket.h>
#include <netdb.h> #include <netdb.h>