From 9bd81a18b9b095a7e6e1584f54288a5247be8618 Mon Sep 17 00:00:00 2001 From: z3APA3A <3APA3A@3proxy.ru> Date: Fri, 27 Apr 2018 01:54:28 +0300 Subject: [PATCH] Use native OpenSSL 1.0 static build for Windows --- Makefile.msvc | 2 +- Makefile.msvc64 | 4 ++-- src/plugins/SSLPlugin/my_ssl.c | 3 +++ src/plugins/SSLPlugin/ssl_plugin.c | 3 --- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.msvc b/Makefile.msvc index 508bb06..b33e3fb 100644 --- a/Makefile.msvc +++ b/Makefile.msvc @@ -14,7 +14,7 @@ LN = link LDFLAGS = /nologo /subsystem:console /incremental:no /machine:I386 DLFLAGS = /DLL DLSUFFICS = .dll -LIBS = ws2_32.lib advapi32.lib odbc32.lib user32.lib kernel32.lib Gdi32.lib libeay32MT.lib ssleay32MT.lib +LIBS = ws2_32.lib advapi32.lib odbc32.lib user32.lib kernel32.lib Gdi32.lib libeay32.lib ssleay32.lib LIBSOLD = libeay32MT.lib ssleay32MT.lib LIBSPREFIX = LIBSSUFFIX = .lib diff --git a/Makefile.msvc64 b/Makefile.msvc64 index 2f2f5cc..92f9e6b 100644 --- a/Makefile.msvc64 +++ b/Makefile.msvc64 @@ -14,8 +14,8 @@ LN = link LDFLAGS = /nologo /subsystem:console /incremental:no /machine:x64 DLFLAGS = /DLL DLSUFFICS = .dll -LIBS = ws2_32.lib advapi32.lib odbc32.lib user32.lib kernel32.lib Gdi32.lib libeay32MT.lib ssleay32MT.lib -LIBSOLD = libeay32MT.lib ssleay32MT.lib +LIBS = ws2_32.lib advapi32.lib odbc32.lib user32.lib kernel32.lib Gdi32.lib libeay32.lib ssleay32.lib +LIBSOLD = libeay32.lib ssleay32.lib LIBSPREFIX = LIBSSUFFIX = .lib LIBEXT = .lib diff --git a/src/plugins/SSLPlugin/my_ssl.c b/src/plugins/SSLPlugin/my_ssl.c index f000bf9..a82eff1 100644 --- a/src/plugins/SSLPlugin/my_ssl.c +++ b/src/plugins/SSLPlugin/my_ssl.c @@ -14,6 +14,9 @@ #include #include #include +#ifdef WIN32 +#include +#endif #include "../../proxy.h" #include "my_ssl.h" diff --git a/src/plugins/SSLPlugin/ssl_plugin.c b/src/plugins/SSLPlugin/ssl_plugin.c index 38d6d27..afd494e 100644 --- a/src/plugins/SSLPlugin/ssl_plugin.c +++ b/src/plugins/SSLPlugin/ssl_plugin.c @@ -12,9 +12,6 @@ #include #include #include -#ifdef WIN32 -#include -#endif #include "../../proxy.h" #include "my_ssl.h"