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

More windows SFTP fixes

Browse Source
This commit is contained in:
Timothy Warren 2015-04-14 13:49:06 -04:00
parent 8c5fe1c7e4
commit 14176bc092
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -8,7 +8,7 @@ PROGRAM_SRC = $(wildcard src/*.cpp src/widgets/*.cpp)
PROGRAM = build/Tyro PROGRAM = build/Tyro
PROGRAM_OBJECTS = $(patsubst %.cpp,%.o, $(PROGRAM_SRC)) 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) -lssh2 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)
@ -25,7 +25,7 @@ dev: all
build: build:
@mkdir -p build @mkdir -p build
$(TARGET): CXXFLAGS += -fPIC #$(TARGET): CXXFLAGS +=
$(TARGET): $(OBJECTS) $(TARGET): $(OBJECTS)
ar rcs $@ $(OBJECTS) ar rcs $@ $(OBJECTS)
ranlib $@ ranlib $@

2
src/network/SFTP.h
View File

@ -14,6 +14,8 @@
#include <cstring> #include <cstring>
#ifdef WIN32 #ifdef WIN32
// Define this so I actually get functions out of the windows header file
#define _WIN32_WINNT 0x0501
#include <Ws2tcpip.h> #include <Ws2tcpip.h>
#else #else
#include <sys/socket.h> #include <sys/socket.h>