moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

Some more MinGW build tweaks.

Browse Source 
Added envvars to specify OpenSSL include, libpath and lib.
Added rule to create curlbuild.h from curlbuild.h.dist.
This commit is contained in:
Guenter Knauf 2011-09-21 02:02:31 +02:00
parent 9ecf53e154
commit a6b69b64ad
3 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/examples/Makefile.m32
View File

@ -40,8 +40,11 @@ endif
ifndef OPENSSL_PATH
OPENSSL_PATH = ../../../openssl-0.9.8r
endif
ifndef OPENSSL_LIB
OPENSSL_LIB = $(OPENSSL_PATH)/out
ifndef OPENSSL_LIBPATH
OPENSSL_LIBPATH = $(OPENSSL_PATH)/out
endif
ifndef OPENSSL_LIBS
OPENSSL_LIBS = -leay32 -lssl32
endif
# Edit the path below to point to the base of your LibSSH2 package.
ifndef LIBSSH2_PATH
@ -91,6 +94,7 @@ endif
LDFLAGS = -s
RC = windres
RCFLAGS = --include-dir=$(PROOT)/include -O COFF -i
RM = del /q /f 2>NUL
CP = copy
@ -165,7 +169,7 @@ ifdef SSH2
endif
ifdef SSL
CFLAGS += -DUSE_SSLEAY -DHAVE_OPENSSL_ENGINE_H
curl_LDADD += -L"$(OPENSSL_LIB)" -leay32 -lssl32
curl_LDADD += -L"$(OPENSSL_LIBPATH)" $(OPENSSL_LIBS)
endif
ifdef ZLIB
INCLUDES += -I"$(ZLIB_PATH)"

20
lib/Makefile.m32
View File

@ -23,8 +23,11 @@ endif
ifndef OPENSSL_INCLUDE
OPENSSL_INCLUDE = $(OPENSSL_PATH)/outinc
endif
ifndef OPENSSL_LIB
OPENSSL_LIB = $(OPENSSL_PATH)/out
ifndef OPENSSL_LIBPATH
OPENSSL_LIBPATH = $(OPENSSL_PATH)/out
endif
ifndef OPENSSL_LIBS
OPENSSL_LIBS = -leay32 -lssl32
endif
# Edit the path below to point to the base of your LibSSH2 package.
ifndef LIBSSH2_PATH
@ -73,9 +76,11 @@ AR = ar
RANLIB = ranlib
RC = windres
RCFLAGS = --include-dir=$(PROOT)/include -DDEBUGBUILD=0 -O COFF -i
RM = del /q /f 2>NUL
STRIP = strip -g
RM = del /q /f 2>NUL
CP = copy
########################################################
## Nothing more to do below this line!
@ -144,7 +149,7 @@ ifdef SSL
CFLAGS += -DUSE_SSLEAY -DUSE_OPENSSL -DHAVE_OPENSSL_ENGINE_H -DHAVE_OPENSSL_PKCS12_H \
-DHAVE_ENGINE_LOAD_BUILTIN_ENGINES -DOPENSSL_NO_KRB5 \
-DCURL_WANTS_CA_BUNDLE_ENV
DLL_LIBS += -L"$(OPENSSL_LIB)" -leay32 -lssl32
DLL_LIBS += -L"$(OPENSSL_LIBPATH)" $(OPENSSL_LIBS)
endif
ifdef ZLIB
INCLUDES += -I"$(ZLIB_PATH)"
@ -227,6 +232,9 @@ $(libcurl_dll_LIBRARY): $(libcurl_a_OBJECTS) $(RESOURCE) $(libcurl_dll_DEPENDENC
$(RC) $(RCFLAGS) $< -o $@
clean:
ifeq "$(wildcard $(PROOT)/include/curl/curlbuild.h.dist)" "$(PROOT)/include/curl/curlbuild.h.dist"
-$(RM) $(subst /,\,$(PROOT)/include/curl/curlbuild.h)
endif
-$(RM) $(libcurl_a_OBJECTS) $(RESOURCE)
distclean vclean: clean
@ -235,3 +243,7 @@ distclean vclean: clean
$(LIBCARES_PATH)/libcares.a:
$(MAKE) -C $(LIBCARES_PATH) -f Makefile.m32
$(PROOT)/include/curl/curlbuild.h:
@echo Creating $@
@$(CP) $(subst /,\,$@).dist $(subst /,\,$@)

10
src/Makefile.m32
View File

@ -20,8 +20,11 @@ endif
ifndef OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.8r
endif
ifndef OPENSSL_LIB
OPENSSL_LIB = $(OPENSSL_PATH)/out
ifndef OPENSSL_LIBPATH
OPENSSL_LIBPATH = $(OPENSSL_PATH)/out
endif
ifndef OPENSSL_LIBS
OPENSSL_LIBS = -leay32 -lssl32
endif
# Edit the path below to point to the base of your LibSSH2 package.
ifndef LIBSSH2_PATH
@ -68,6 +71,7 @@ endif
LDFLAGS = -s
RC = windres
RCFLAGS = --include-dir=$(PROOT)/include -O COFF -i
RM = del /q /f 2>NUL
CP = copy
@ -146,7 +150,7 @@ ifdef SSH2
endif
ifdef SSL
CFLAGS += -DUSE_SSLEAY -DHAVE_OPENSSL_ENGINE_H
curl_LDADD += -L"$(OPENSSL_LIB)" -leay32 -lssl32
curl_LDADD += -L"$(OPENSSL_LIBPATH)" $(OPENSSL_LIBS)
endif
ifdef ZLIB
INCLUDES += -I"$(ZLIB_PATH)"