moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

makefile.m32: add missing libs for static -winssl-ssh2 builds

Browse Source 
Bug: https://github.com/curl/curl/pull/693
This commit is contained in:
Viktor Szakats 2016-03-02 03:25:22 +01:00 committed by Jay Satiro
parent 81bdd85318
commit 6c7a5b9603
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Makefile.m32
View File

@ -217,6 +217,11 @@ ifdef SSH2
INCLUDES += -I"$(LIBSSH2_PATH)/include" -I"$(LIBSSH2_PATH)/win32" INCLUDES += -I"$(LIBSSH2_PATH)/include" -I"$(LIBSSH2_PATH)/win32"
CFLAGS += -DUSE_LIBSSH2 -DHAVE_LIBSSH2_H CFLAGS += -DUSE_LIBSSH2 -DHAVE_LIBSSH2_H
DLL_LIBS += -L"$(LIBSSH2_PATH)/win32" -lssh2 DLL_LIBS += -L"$(LIBSSH2_PATH)/win32" -lssh2
ifdef WINSSL
ifndef DYN
DLL_LIBS += -lbcrypt -lcrypt32
endif
endif
endif endif
ifdef SSL ifdef SSL
ifndef OPENSSL_INCLUDE ifndef OPENSSL_INCLUDE

5
src/Makefile.m32
View File

@ -238,6 +238,11 @@ endif
ifdef SSH2 ifdef SSH2
CFLAGS += -DUSE_LIBSSH2 -DHAVE_LIBSSH2_H CFLAGS += -DUSE_LIBSSH2 -DHAVE_LIBSSH2_H
curl_LDADD += -L"$(LIBSSH2_PATH)/win32" -lssh2 curl_LDADD += -L"$(LIBSSH2_PATH)/win32" -lssh2
ifdef WINSSL
ifndef DYN
curl_LDADD += -lbcrypt -lcrypt32
endif
endif
endif endif
ifdef SSL ifdef SSL
ifndef OPENSSL_INCLUDE ifndef OPENSSL_INCLUDE