diff --git a/docs/examples/Makefile.m32 b/docs/examples/Makefile.m32 index f607013c25c398..1aa2e0018725fc 100644 --- a/docs/examples/Makefile.m32 +++ b/docs/examples/Makefile.m32 @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2015, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -21,7 +21,7 @@ ########################################################################### # ## Makefile for building curl examples with MingW (GCC-3.2 or later) -## and optionally OpenSSL (0.9.8), libssh2 (1.3), zlib (1.2.5), librtmp (2.3) +## and optionally OpenSSL (1.0.2a), libssh2 (1.5), zlib (1.2.8), librtmp (2.4) ## ## Usage: mingw32-make -f Makefile.m32 CFG=-feature1[-feature2][-feature3][...] ## Example: mingw32-make -f Makefile.m32 CFG=-zlib-ssl-spi-winidn @@ -38,23 +38,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-0.9.8zc +OPENSSL_PATH = ../../../openssl-1.0.2a endif # Edit the path below to point to the base of your LibSSH2 package. ifndef LIBSSH2_PATH -LIBSSH2_PATH = ../../../libssh2-1.4.3 +LIBSSH2_PATH = ../../../libssh2-1.5.0 endif # Edit the path below to point to the base of your librtmp package. ifndef LIBRTMP_PATH -LIBRTMP_PATH = ../../../librtmp-2.3 +LIBRTMP_PATH = ../../../librtmp-2.4 endif # Edit the path below to point to the base of your libidn package. ifndef LIBIDN_PATH -LIBIDN_PATH = ../../../libidn-1.18 +LIBIDN_PATH = ../../../libidn-1.30 endif # Edit the path below to point to the base of your MS IDN package. # Microsoft Internationalized Domain Names (IDN) Mitigation APIs 1.1 -# http://www.microsoft.com/downloads/en/details.aspx?FamilyID=ad6158d7-ddba-416a-9109-07607425a815 +# https://www.microsoft.com/en-us/download/details.aspx?id=734 ifndef WINIDN_PATH WINIDN_PATH = ../../../Microsoft IDN Mitigation APIs endif @@ -62,6 +62,10 @@ endif ifndef LDAP_SDK 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-0.7.13 +endif PROOT = ../.. @@ -72,14 +76,24 @@ endif # Edit the var below to set to your architecture or set environment var. ifndef ARCH -ARCH = w32 +ifeq ($(findstring x86_64,$(shell $(CC) -dumpmachine)),x86_64) +ARCH = w64 +else +ARCH = w32 +endif endif CC = $(CROSSPREFIX)gcc CFLAGS = -g -O2 -Wall CFLAGS += -fno-strict-aliasing ifeq ($(ARCH),w64) -CFLAGS += -D_AMD64_ +CFLAGS += -m64 -D_AMD64_ +LDFLAGS += -m64 +RCFLAGS += -F pe-x86-64 +else +CFLAGS += -m32 +LDFLAGS += -m32 +RCFLAGS += -F pe-i386 endif # comment LDFLAGS below to keep debug info LDFLAGS = -s @@ -158,9 +172,12 @@ ifeq ($(findstring -metalink,$(CFG)),-metalink) METALINK = 1 endif ifeq ($(findstring -winssl,$(CFG)),-winssl) -SCHANNEL = 1 +WINSSL = 1 SSPI = 1 endif +ifeq ($(findstring -nghttp2,$(CFG)),-nghttp2) +NGHTTP2 = 1 +endif INCLUDES = -I. -I$(PROOT) -I$(PROOT)/include -I$(PROOT)/lib @@ -184,6 +201,10 @@ ifdef RTMP CFLAGS += -DUSE_LIBRTMP curl_LDADD += -L"$(LIBRTMP_PATH)/librtmp" -lrtmp -lwinmm endif +ifdef NGHTTP2 + CFLAGS += -DUSE_NGHTTP2 + curl_LDADD += -L"$(NGHTTP2_PATH)/lib" -lnghttp2 +endif ifdef SSH2 CFLAGS += -DUSE_LIBSSH2 -DHAVE_LIBSSH2_H curl_LDADD += -L"$(LIBSSH2_PATH)/win32" -lssh2 @@ -204,7 +225,7 @@ ifdef SSL ifndef DYN OPENSSL_LIBS += -lgdi32 -lcrypt32 endif - CFLAGS += -DUSE_SSLEAY + CFLAGS += -DUSE_OPENSSL curl_LDADD += -L"$(OPENSSL_LIBPATH)" $(OPENSSL_LIBS) endif ifdef ZLIB @@ -223,7 +244,7 @@ endif endif ifdef SSPI CFLAGS += -DUSE_WINDOWS_SSPI - ifdef SCHANNEL + ifdef WINSSL CFLAGS += -DUSE_SCHANNEL endif endif diff --git a/docs/examples/Makefile.netware b/docs/examples/Makefile.netware index 3fd6b3e77967d5..f8e9955ed41564 100644 --- a/docs/examples/Makefile.netware +++ b/docs/examples/Makefile.netware @@ -19,12 +19,12 @@ endif # Edit the path below to point to the base of your OpenSSL package. ifndef OPENSSL_PATH -OPENSSL_PATH = ../../../openssl-0.9.8zc +OPENSSL_PATH = ../../../openssl-1.0.2a endif # Edit the path below to point to the base of your LibSSH2 package. ifndef LIBSSH2_PATH -LIBSSH2_PATH = ../../../libssh2-1.4.3 +LIBSSH2_PATH = ../../../libssh2-1.5.0 endif # Edit the path below to point to the base of your axTLS package. @@ -34,12 +34,12 @@ endif # Edit the path below to point to the base of your libidn package. ifndef LIBIDN_PATH -LIBIDN_PATH = ../../../libidn-1.18 +LIBIDN_PATH = ../../../libidn-1.30 endif # Edit the path below to point to the base of your librtmp package. ifndef LIBRTMP_PATH -LIBRTMP_PATH = ../../../librtmp-2.3 +LIBRTMP_PATH = ../../../librtmp-2.4 endif # Edit the path below to point to the base of your fbopenssl package. diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom index 14f5ac8442fc4f..0b7ba59c2a643f 100644 --- a/lib/Makefile.Watcom +++ b/lib/Makefile.Watcom @@ -101,7 +101,7 @@ ZLIB_ROOT = ../../zlib-1.2.8 !ifdef %libssh2_root LIBSSH2_ROOT = $(%libssh2_root) !else -LIBSSH2_ROOT = ../../libssh2-1.4.3 +LIBSSH2_ROOT = ../../libssh2-1.5.0 !endif !ifdef %librtmp_root @@ -113,7 +113,7 @@ LIBRTMP_ROOT = ../../rtmpdump-2.3 !ifdef %openssl_root OPENSSL_ROOT = $(%openssl_root) !else -OPENSSL_ROOT = ../../openssl-0.9.8zc +OPENSSL_ROOT = ../../openssl-1.0.2a !endif !ifdef %ares_root diff --git a/lib/Makefile.b32 b/lib/Makefile.b32 index 0565705758330c..37c2648717f98b 100644 --- a/lib/Makefile.b32 +++ b/lib/Makefile.b32 @@ -27,7 +27,7 @@ ZLIB_PATH = ..\..\zlib-1.2.8 # Edit the path below to point to the base of your OpenSSL package. !ifndef OPENSSL_PATH -OPENSSL_PATH = ..\..\openssl-0.9.8zc +OPENSSL_PATH = ..\..\openssl-1.0.2a !endif # Set libcurl static lib, dll and import lib diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 index f211074afb04c3..068947fae7b44c 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 (0.9.8), libssh2 (1.3), zlib (1.2.5), librtmp (2.3) +## and optionally OpenSSL (1.0.2a), libssh2 (1.5), zlib (1.2.8), librtmp (2.4) ## ## 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-0.9.8zc +OPENSSL_PATH = ../../openssl-1.0.2a endif # Edit the path below to point to the base of your LibSSH2 package. ifndef LIBSSH2_PATH -LIBSSH2_PATH = ../../libssh2-1.4.3 +LIBSSH2_PATH = ../../libssh2-1.5.0 endif # Edit the path below to point to the base of your librtmp package. ifndef LIBRTMP_PATH -LIBRTMP_PATH = ../../librtmp-2.3 +LIBRTMP_PATH = ../../librtmp-2.4 endif # Edit the path below to point to the base of your libidn package. ifndef LIBIDN_PATH -LIBIDN_PATH = ../../libidn-1.18 +LIBIDN_PATH = ../../libidn-1.30 endif # Edit the path below to point to the base of your MS IDN package. # Microsoft Internationalized Domain Names (IDN) Mitigation APIs 1.1 -# http://www.microsoft.com/downloads/en/details.aspx?FamilyID=ad6158d7-ddba-416a-9109-07607425a815 +# https://www.microsoft.com/en-us/download/details.aspx?id=734 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-0.6.7 +NGHTTP2_PATH = ../../nghttp2-0.7.13 endif PROOT = .. diff --git a/lib/Makefile.netware b/lib/Makefile.netware index 2cd754a70fa7ce..5a955f889e461b 100644 --- a/lib/Makefile.netware +++ b/lib/Makefile.netware @@ -19,12 +19,12 @@ endif # Edit the path below to point to the base of your OpenSSL package. ifndef OPENSSL_PATH -OPENSSL_PATH = ../../openssl-0.9.8zc +OPENSSL_PATH = ../../openssl-1.0.2a endif # Edit the path below to point to the base of your LibSSH2 package. ifndef LIBSSH2_PATH -LIBSSH2_PATH = ../../libssh2-1.4.3 +LIBSSH2_PATH = ../../libssh2-1.5.0 endif # Edit the path below to point to the base of your axTLS package. diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6 index 04d4c67cebdfde..6d8915e253882f 100644 --- a/lib/Makefile.vc6 +++ b/lib/Makefile.vc6 @@ -65,11 +65,11 @@ !INCLUDE ..\winbuild\Makefile.msvc.names !IFNDEF OPENSSL_PATH -OPENSSL_PATH = ../../openssl-0.9.8zc +OPENSSL_PATH = ../../openssl-1.0.2a !ENDIF !IFNDEF LIBSSH2_PATH -LIBSSH2_PATH = ../../libssh2-1.4.3 +LIBSSH2_PATH = ../../libssh2-1.5.0 !ENDIF !IFNDEF ZLIB_PATH @@ -90,7 +90,7 @@ MACHINE = X86 # If, for some reason the Windows SDK is installed but not installed # in the default location, you can specify WINDOWS_SDK_PATH. # It can be downloaded from: -# http://www.microsoft.com/msdownload/platformsdk/sdkupdate/ +# https://msdn.microsoft.com/windows/bb980924.aspx # WINDOWS_SSPI = 1 @@ -427,7 +427,7 @@ CFGSET = TRUE TARGET = $(LIBCURL_DYN_LIB_DBG) DIROBJ = $(CFG) LNK = $(LNKDLL) $(WINLIBS) /DEBUG /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(LIBCURL_IMP_LIB_DBG) /PDB:$(DIROBJ)\$(LIBCURL_DYN_LIB_PDB) -CC = $(CCDEBUG) $(RTLIBD) +CC = $(CCDEBUG) $(RTLIBD) CFGSET = TRUE RESOURCE = $(DIROBJ)\libcurl.res !ENDIF diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom index 3945f96e561eaf..6ec598d462eb20 100644 --- a/src/Makefile.Watcom +++ b/src/Makefile.Watcom @@ -96,7 +96,7 @@ ZLIB_ROOT = ../../zlib-1.2.8 !ifdef %libssh2_root LIBSSH2_ROOT = $(%libssh2_root) !else -LIBSSH2_ROOT = ../../libssh2-1.4.3 +LIBSSH2_ROOT = ../../libssh2-1.5.0 !endif !ifdef %librtmp_root @@ -108,7 +108,7 @@ LIBRTMP_ROOT = ../../rtmpdump-2.3 !ifdef %openssl_root OPENSSL_ROOT = $(%openssl_root) !else -OPENSSL_ROOT = ../../openssl-0.9.8zc +OPENSSL_ROOT = ../../openssl-1.0.2a !endif !ifdef %ares_root diff --git a/src/Makefile.b32 b/src/Makefile.b32 index 25052261989167..85fe49f8dff1e0 100644 --- a/src/Makefile.b32 +++ b/src/Makefile.b32 @@ -27,7 +27,7 @@ ZLIB_PATH = ..\..\zlib-1.2.8 # Edit the path below to point to the base of your OpenSSL package. !ifndef OPENSSL_PATH -OPENSSL_PATH = ..\..\openssl-0.9.8zc +OPENSSL_PATH = ..\..\openssl-1.0.2a !endif # Set program's name diff --git a/src/Makefile.m32 b/src/Makefile.m32 index 366983388715db..c951ae9dea9995 100644 --- a/src/Makefile.m32 +++ b/src/Makefile.m32 @@ -1,7 +1,7 @@ ########################################################################### # ## Makefile for building curl.exe with MingW (GCC-3.2 or later) -## and optionally OpenSSL (0.9.8), libssh2 (1.3), zlib (1.2.5), librtmp (2.3) +## and optionally OpenSSL (1.0.2a), libssh2 (1.5), zlib (1.2.8), librtmp (2.4) ## ## Usage: mingw32-make -f Makefile.m32 CFG=-feature1[-feature2][-feature3][...] ## Example: mingw32-make -f Makefile.m32 CFG=-zlib-ssl-spi-winidn @@ -18,19 +18,19 @@ 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-0.9.8zc +OPENSSL_PATH = ../../openssl-1.0.2a endif # Edit the path below to point to the base of your LibSSH2 package. ifndef LIBSSH2_PATH -LIBSSH2_PATH = ../../libssh2-1.4.3 +LIBSSH2_PATH = ../../libssh2-1.5.0 endif # Edit the path below to point to the base of your librtmp package. ifndef LIBRTMP_PATH -LIBRTMP_PATH = ../../librtmp-2.3 +LIBRTMP_PATH = ../../librtmp-2.4 endif # Edit the path below to point to the base of your libmetalink package. ifndef LIBMETALINK_PATH -LIBMETALINK_PATH = ../../libmetalink-0.1.2 +LIBMETALINK_PATH = ../../libmetalink-0.1.3 endif # Edit the path below to point to the base of your libexpat package. ifndef LIBEXPAT_PATH @@ -38,15 +38,15 @@ LIBEXPAT_PATH = ../../expat-2.1.0 endif # Edit the path below to point to the base of your libxml2 package. ifndef LIBXML2_PATH -LIBXML2_PATH = ../../libxml2-2.9.0 +LIBXML2_PATH = ../../libxml2-2.9.2 endif # Edit the path below to point to the base of your libidn package. ifndef LIBIDN_PATH -LIBIDN_PATH = ../../libidn-1.18 +LIBIDN_PATH = ../../libidn-1.30 endif # Edit the path below to point to the base of your MS IDN package. # Microsoft Internationalized Domain Names (IDN) Mitigation APIs 1.1 -# http://www.microsoft.com/downloads/en/details.aspx?FamilyID=ad6158d7-ddba-416a-9109-07607425a815 +# https://www.microsoft.com/en-us/download/details.aspx?id=734 ifndef WINIDN_PATH WINIDN_PATH = ../../Microsoft IDN Mitigation APIs endif @@ -56,7 +56,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-0.6.7 +NGHTTP2_PATH = ../../nghttp2-0.7.13 endif PROOT = .. diff --git a/src/Makefile.netware b/src/Makefile.netware index b6b4861c81db80..5065cbfe809cca 100644 --- a/src/Makefile.netware +++ b/src/Makefile.netware @@ -19,12 +19,12 @@ endif # Edit the path below to point to the base of your OpenSSL package. ifndef OPENSSL_PATH -OPENSSL_PATH = ../../openssl-0.9.8zc +OPENSSL_PATH = ../../openssl-1.0.2a endif # Edit the path below to point to the base of your LibSSH2 package. ifndef LIBSSH2_PATH -LIBSSH2_PATH = ../../libssh2-1.4.3 +LIBSSH2_PATH = ../../libssh2-1.5.0 endif # Edit the path below to point to the base of your axTLS package. diff --git a/src/Makefile.vc6 b/src/Makefile.vc6 index 415d528fbc3de2..eec89c25cec782 100644 --- a/src/Makefile.vc6 +++ b/src/Makefile.vc6 @@ -56,7 +56,7 @@ PROGRAM_NAME = curl.exe !IFNDEF OPENSSL_PATH -OPENSSL_PATH = ../../openssl-0.9.8zc +OPENSSL_PATH = ../../openssl-1.0.2a !ENDIF !IFNDEF ZLIB_PATH @@ -77,7 +77,7 @@ MACHINE = X86 # If, for some reason the Windows SDK is installed but not installed # in the default location, you can specify WINDOWS_SDK_PATH. # It can be downloaded from: -# http://www.microsoft.com/msdownload/platformsdk/sdkupdate/ +# https://msdn.microsoft.com/windows/bb980924.aspx # WINDOWS_SSPI = 1