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

enabled build with libssh2.

Browse Source
This commit is contained in:
Gunter Knauf 2007-01-25 13:14:42 +00:00
parent 10a13eba72
commit 4b27fae069
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Makefile.m32
View File

@ -2,18 +2,21 @@
# $Id$ # $Id$
# #
## Makefile for building libcurl.a with MingW32 (GCC-3.2) and ## Makefile for building libcurl.a with MingW32 (GCC-3.2) and
## optionally OpenSSL (0.9.7) ## optionally OpenSSL (0.9.8)
## ##
## Use: make -f Makefile.m32 ## Use: make -f Makefile.m32 [SSL=1] [SSH2=1] [DYN=1]
## ##
## Comments to: Troy Engel <tengel@sonic.net> or ## Comments to: Troy Engel <tengel@sonic.net> or
## Joern Hartroth <hartroth@acm.org> ## Joern Hartroth <hartroth@acm.org>
ifndef OPENSSL_PATH ifndef OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.7d OPENSSL_PATH = ../../openssl-0.9.8d
endif
ifndef LIBSSH2_PATH
LIBSSH2_PATH = ../../libssh2-0.14
endif endif
ifndef ZLIB_PATH ifndef ZLIB_PATH
ZLIB_PATH = ../../zlib-1.2.1 ZLIB_PATH = ../../zlib-1.2.3
endif endif
CC = gcc CC = gcc
@ -27,12 +30,17 @@ STRIP = strip -g
INCLUDES = -I. -I../include INCLUDES = -I. -I../include
CFLAGS = -g -O2 -DMINGW32 -DBUILDING_LIBCURL -DHAVE_LONGLONG CFLAGS = -g -O2 -DMINGW32 -DBUILDING_LIBCURL -DHAVE_LONGLONG
ifdef SSH2
INCLUDES += -I"$(LIBSSH2_PATH)/include" -I"$(LIBSSH2_PATH)/win32"
CFLAGS += -DUSE_LIBSSH2 -DHAVE_LIBSSH2_H
DLL_LIBS += -L$(LIBSSH2_PATH)/win32 -lssh2
endif
ifdef SSL ifdef SSL
INCLUDES += -I"$(OPENSSL_PATH)/outinc" -I"$(OPENSSL_PATH)/outinc/openssl" INCLUDES += -I"$(OPENSSL_PATH)/outinc" -I"$(OPENSSL_PATH)/outinc/openssl"
CFLAGS += -DUSE_SSLEAY -DUSE_OPENSSL -DHAVE_OPENSSL_ENGINE_H -DHAVE_OPENSSL_PKCS12_H \ CFLAGS += -DUSE_SSLEAY -DUSE_OPENSSL -DHAVE_OPENSSL_ENGINE_H -DHAVE_OPENSSL_PKCS12_H \
-DHAVE_ENGINE_LOAD_BUILTIN_ENGINES -DOPENSSL_NO_KRB5 \ -DHAVE_ENGINE_LOAD_BUILTIN_ENGINES -DOPENSSL_NO_KRB5 \
-DCURL_CA_BUNDLE='getenv("CURL_CA_BUNDLE")' -DCURL_CA_BUNDLE='getenv("CURL_CA_BUNDLE")'
DLL_LIBS = -L$(OPENSSL_PATH)/out -leay32 -lssl32 DLL_LIBS += -L$(OPENSSL_PATH)/out -leay32 -lssl32
endif endif
ifdef ZLIB ifdef ZLIB
INCLUDES += -I"$(ZLIB_PATH)" INCLUDES += -I"$(ZLIB_PATH)"

21
src/Makefile.m32
View File

@ -2,18 +2,21 @@
# $Id$ # $Id$
# #
## Makefile for building curl.exe with MingW32 (GCC-3.2) and ## Makefile for building curl.exe with MingW32 (GCC-3.2) and
## optionally OpenSSL (0.9.7) ## optionally OpenSSL (0.9.8)
## ##
## Use: make -f Makefile.m32 [SSL=1] [DYN=1] ## Use: make -f Makefile.m32 [SSL=1] [SSH2=1] [DYN=1]
## ##
## Comments to: Troy Engel <tengel@sonic.net> or ## Comments to: Troy Engel <tengel@sonic.net> or
## Joern Hartroth <hartroth@acm.org> ## Joern Hartroth <hartroth@acm.org>
ifndef OPENSSL_PATH ifndef OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.7d OPENSSL_PATH = ../../openssl-0.9.8d
endif
ifndef LIBSSH2_PATH
LIBSSH2_PATH = ../../libssh2-0.14
endif endif
ifndef ZLIB_PATH ifndef ZLIB_PATH
ZLIB_PATH = ../../zlib-1.2.1 ZLIB_PATH = ../../zlib-1.2.3
endif endif
CC = gcc CC = gcc
@ -29,9 +32,6 @@ STRIP = strip -s
INCLUDES = -I. -I.. -I../include -I../lib -I$(ZLIB_PATH) INCLUDES = -I. -I.. -I../include -I../lib -I$(ZLIB_PATH)
CFLAGS = -g -O2 -DMINGW32 CFLAGS = -g -O2 -DMINGW32
ifdef SSL
CFLAGS += -DUSE_SSLEAY -DHAVE_OPENSSL_ENGINE_H
endif
LDFLAGS = LDFLAGS =
COMPILE = $(CC) $(INCLUDES) $(CFLAGS) COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
@ -45,10 +45,15 @@ else
curl_LDADD = -L../lib -lcurl curl_LDADD = -L../lib -lcurl
COMPILE += -DCURL_STATICLIB COMPILE += -DCURL_STATICLIB
endif endif
curl_LDADD += -lwsock32 -lws2_32 -lwinmm -L$(ZLIB_PATH) -lz ifdef SSH2
CFLAGS += -DUSE_LIBSSH2 -DHAVE_LIBSSH2_H
curl_LDADD += -L$(LIBSSH2_PATH)/win32 -lssh2
endif
ifdef SSL ifdef SSL
CFLAGS += -DUSE_SSLEAY -DHAVE_OPENSSL_ENGINE_H
curl_LDADD += -L$(OPENSSL_PATH)/out -leay32 -lssl32 curl_LDADD += -L$(OPENSSL_PATH)/out -leay32 -lssl32
endif endif
curl_LDADD += -lwsock32 -lws2_32 -lwinmm -L$(ZLIB_PATH) -lz
# Makefile.inc provides the CSOURCES and HHEADERS defines # Makefile.inc provides the CSOURCES and HHEADERS defines
include Makefile.inc include Makefile.inc