From 14176bc092039fa5ed5e1d27ec0b64222129c1e7 Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Tue, 14 Apr 2015 13:49:06 -0400 Subject: [PATCH] More windows SFTP fixes --- Makefile | 4 ++-- src/network/SFTP.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 53debac..9c092c3 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ PROGRAM_SRC = $(wildcard src/*.cpp src/widgets/*.cpp) PROGRAM = build/Tyro 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 WX_CXXFLAGS = $(shell wx-config --cxxflags) $(BASE_FLAGS) @@ -25,7 +25,7 @@ dev: all build: @mkdir -p build -$(TARGET): CXXFLAGS += -fPIC +#$(TARGET): CXXFLAGS += $(TARGET): $(OBJECTS) ar rcs $@ $(OBJECTS) ranlib $@ diff --git a/src/network/SFTP.h b/src/network/SFTP.h index 058609d..dd236de 100644 --- a/src/network/SFTP.h +++ b/src/network/SFTP.h @@ -14,6 +14,8 @@ #include #ifdef WIN32 + // Define this so I actually get functions out of the windows header file + #define _WIN32_WINNT 0x0501 #include #else #include