diff options
| author | Guenter Knauf <lists@gknw.net> | 2011-09-21 02:02:31 +0200 |
|---|---|---|
| committer | Guenter Knauf <lists@gknw.net> | 2011-09-21 02:06:05 +0200 |
| commit | a6b69b64ad402fade4f04434395e2ea97da55fa8 (patch) | |
| tree | 707a421d8aab4b5d2b7617bf9975f1114e98ec25 /lib | |
| parent | 9ecf53e1544e90aeb2e667fdbbc84f05e341cc07 (diff) | |
Some more MinGW build tweaks.
Added envvars to specify OpenSSL include, libpath and lib.
Added rule to create curlbuild.h from curlbuild.h.dist.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.m32 | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 index c7c4970b4..4ed670d6f 100644 --- a/lib/Makefile.m32 +++ b/lib/Makefile.m32 @@ -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 /,\,$@) + |