aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViktor Szakats <vszakats@users.noreply.github.com>2016-03-02 03:25:22 +0100
committerJay Satiro <raysatiro@yahoo.com>2016-03-05 21:50:12 -0500
commit6c7a5b9603f58c9562bbfe0637540f81fa98d055 (patch)
tree83cddccd26c3e6385b7faefe5bdc3d403171a490
parent81bdd85318da503df9320fb04267da12a8ec9e5f (diff)
makefile.m32: add missing libs for static -winssl-ssh2 builds
Bug: https://github.com/curl/curl/pull/693
-rw-r--r--lib/Makefile.m325
-rw-r--r--src/Makefile.m325
2 files changed, 10 insertions, 0 deletions
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index b6d9eb09c..2142bfc42 100644
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -217,6 +217,11 @@ ifdef SSH2
INCLUDES += -I"$(LIBSSH2_PATH)/include" -I"$(LIBSSH2_PATH)/win32"
CFLAGS += -DUSE_LIBSSH2 -DHAVE_LIBSSH2_H
DLL_LIBS += -L"$(LIBSSH2_PATH)/win32" -lssh2
+ ifdef WINSSL
+ ifndef DYN
+ DLL_LIBS += -lbcrypt -lcrypt32
+ endif
+ endif
endif
ifdef SSL
ifndef OPENSSL_INCLUDE
diff --git a/src/Makefile.m32 b/src/Makefile.m32
index d941da952..076fc5e35 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -238,6 +238,11 @@ endif
ifdef SSH2
CFLAGS += -DUSE_LIBSSH2 -DHAVE_LIBSSH2_H
curl_LDADD += -L"$(LIBSSH2_PATH)/win32" -lssh2
+ ifdef WINSSL
+ ifndef DYN
+ curl_LDADD += -lbcrypt -lcrypt32
+ endif
+ endif
endif
ifdef SSL
ifndef OPENSSL_INCLUDE