Răsfoiți Sursa

Use native OpenSSL 1.0 static build for Windows

z3APA3A 7 ani în urmă
părinte
comite
9bd81a18b9

+ 1 - 1
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

+ 2 - 2
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

+ 3 - 0
src/plugins/SSLPlugin/my_ssl.c

@@ -14,6 +14,9 @@
 #include <openssl/pem.h>
 #include <openssl/ssl.h>
 #include <openssl/err.h>
+#ifdef WIN32
+#include <openssl/applink.c>
+#endif
 
 #include "../../proxy.h"
 #include "my_ssl.h"

+ 0 - 3
src/plugins/SSLPlugin/ssl_plugin.c

@@ -12,9 +12,6 @@
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 #include <openssl/ssl.h>
-#ifdef WIN32
-#include <openssl/applink.c>
-#endif
 #include "../../proxy.h"
 #include "my_ssl.h"