diff options
Diffstat (limited to 'lib/Makefile.m32')
| -rw-r--r-- | lib/Makefile.m32 | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 index 736e600f5..f3673c5a3 100644 --- a/lib/Makefile.m32 +++ b/lib/Makefile.m32 @@ -1,7 +1,7 @@ ########################################################################### # ## Makefile for building libcurl.a with MingW (GCC-3.2 or later) -## and optionally OpenSSL (1.0.2a), libssh2 (1.5), zlib (1.2.8), librtmp (2.4) +## and optionally OpenSSL (0.9.8), libssh2 (1.3), zlib (1.2.5), librtmp (2.3) ## ## Usage: mingw32-make -f Makefile.m32 CFG=-feature1[-feature2][-feature3][...] ## Example: mingw32-make -f Makefile.m32 CFG=-zlib-ssl-sspi-winidn @@ -18,23 +18,23 @@ ZLIB_PATH = ../../zlib-1.2.8 endif # Edit the path below to point to the base of your OpenSSL package. ifndef OPENSSL_PATH -OPENSSL_PATH = ../../openssl-1.0.2a +OPENSSL_PATH = ../../openssl-0.9.8zc endif # Edit the path below to point to the base of your LibSSH2 package. ifndef LIBSSH2_PATH -LIBSSH2_PATH = ../../libssh2-1.5.0 +LIBSSH2_PATH = ../../libssh2-1.4.3 endif # Edit the path below to point to the base of your librtmp package. ifndef LIBRTMP_PATH -LIBRTMP_PATH = ../../librtmp-2.4 +LIBRTMP_PATH = ../../librtmp-2.3 endif # Edit the path below to point to the base of your libidn package. ifndef LIBIDN_PATH -LIBIDN_PATH = ../../libidn-1.32 +LIBIDN_PATH = ../../libidn-1.18 endif # Edit the path below to point to the base of your MS IDN package. # Microsoft Internationalized Domain Names (IDN) Mitigation APIs 1.1 -# https://www.microsoft.com/en-us/download/details.aspx?id=734 +# http://www.microsoft.com/downloads/en/details.aspx?FamilyID=ad6158d7-ddba-416a-9109-07607425a815 ifndef WINIDN_PATH WINIDN_PATH = ../../Microsoft IDN Mitigation APIs endif @@ -44,7 +44,7 @@ LDAP_SDK = c:/novell/ndk/cldapsdk/win32 endif # Edit the path below to point to the base of your nghttp2 package. ifndef NGHTTP2_PATH -NGHTTP2_PATH = ../../nghttp2-1.0.0 +NGHTTP2_PATH = ../../nghttp2-0.6.7 endif PROOT = .. @@ -55,10 +55,10 @@ LIBCARES_PATH = $(PROOT)/ares endif CC = $(CROSSPREFIX)gcc -CFLAGS = $(CURL_CFLAG_EXTRAS) -g -O2 -Wall +CFLAGS = -g -O2 -Wall CFLAGS += -fno-strict-aliasing # comment LDFLAGS below to keep debug info -LDFLAGS = $(CURL_LDFLAG_EXTRAS) -s +LDFLAGS = -s AR = $(CROSSPREFIX)ar RANLIB = $(CROSSPREFIX)ranlib RC = $(CROSSPREFIX)windres @@ -75,12 +75,10 @@ endif endif ifeq ($(ARCH),w64) -CFLAGS += -m64 -D_AMD64_ -LDFLAGS += -m64 +CFLAGS += -D_AMD64_ RCFLAGS += -F pe-x86-64 else CFLAGS += -m32 -LDFLAGS += -m32 RCFLAGS += -F pe-i386 endif @@ -216,17 +214,14 @@ ifdef SSL OPENSSL_LIBS = -lcrypto -lssl endif endif - ifndef DYN - OPENSSL_LIBS += -lgdi32 -lcrypt32 - endif INCLUDES += -I"$(OPENSSL_INCLUDE)" - CFLAGS += -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 \ -DCURL_WANTS_CA_BUNDLE_ENV DLL_LIBS += -L"$(OPENSSL_LIBPATH)" $(OPENSSL_LIBS) ifdef SRP ifeq "$(wildcard $(OPENSSL_INCLUDE)/openssl/srp.h)" "$(OPENSSL_INCLUDE)/openssl/srp.h" - CFLAGS += -DHAVE_OPENSSL_SRP -DUSE_TLS_SRP + CFLAGS += -DHAVE_SSLEAY_SRP -DUSE_TLS_SRP endif endif endif @@ -328,3 +323,5 @@ $(PROOT)/include/curl/curlbuild.h: $(LIBCARES_PATH)/libcares.a: $(MAKE) -C $(LIBCARES_PATH) -f Makefile.m32 + + |