Commit 6a612859 authored by Viktor Szakats's avatar Viktor Szakats Committed by Daniel Stenberg
Browse files

build: update depedency versions, urls, example makefiles 

- update default versions of dependencies (except for rare/old platforms)
- update urls
- sync examples makefiles with main ones
- remove line ending space
parent 42716951

docs/examples/Makefile.m32

+33 −12
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#                            | (__| |_| |  _ <| |___

#                             \___|\___/|_| \_\_____|

#

# Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.

# Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, 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

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

docs/examples/Makefile.netware

+4 −4
Original line number Diff line number Diff line
@@ -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.

lib/Makefile.Watcom

+2 −2
Original line number Diff line number Diff line
@@ -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

lib/Makefile.b32

+1 −1
Original line number Diff line number Diff line
@@ -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

lib/Makefile.m32

+7 −7
Original line number Diff line number Diff line 
###########################################################################

#

## 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 = ..