Skip to content
This repository was archived by the owner on Mar 1, 2023. It is now read-only.

Commit ae26ee3

Browse files
committed
Updated zlib version in build files.
1 parent 992bee5 commit ae26ee3

14 files changed

+19
-19
lines changed

docs/INSTALL

+2-2
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ Win32
220220
adjust as necessary. It is also possible to override these paths with
221221
environment variables, for example:
222222

223-
set ZLIB_PATH=c:\zlib-1.2.7
223+
set ZLIB_PATH=c:\zlib-1.2.8
224224
set OPENSSL_PATH=c:\openssl-0.9.8y
225225
set LIBSSH2_PATH=c:\libssh2-1.4.3
226226

@@ -323,7 +323,7 @@ Win32
323323
documentation on how to compile zlib. Define the ZLIB_PATH environment
324324
variable to the location of zlib.h and zlib.lib, for example:
325325

326-
set ZLIB_PATH=c:\zlib-1.2.7
326+
set ZLIB_PATH=c:\zlib-1.2.8
327327

328328
Then run 'nmake vc-zlib' in curl's root directory.
329329

docs/examples/Makefile.m32

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@
2727
## Example: mingw32-make -f Makefile.m32 CFG=-zlib-ssl-spi-winidn
2828
##
2929
## Hint: you can also set environment vars to control the build, f.e.:
30-
## set ZLIB_PATH=c:/zlib-1.2.7
30+
## set ZLIB_PATH=c:/zlib-1.2.8
3131
## set ZLIB=1
3232
#
3333
###########################################################################
3434

3535
# Edit the path below to point to the base of your Zlib sources.
3636
ifndef ZLIB_PATH
37-
ZLIB_PATH = ../../../zlib-1.2.7
37+
ZLIB_PATH = ../../../zlib-1.2.8
3838
endif
3939
# Edit the path below to point to the base of your OpenSSL package.
4040
ifndef OPENSSL_PATH

docs/examples/Makefile.netware

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ endif
1414

1515
# Edit the path below to point to the base of your Zlib sources.
1616
ifndef ZLIB_PATH
17-
ZLIB_PATH = ../../../zlib-1.2.7
17+
ZLIB_PATH = ../../../zlib-1.2.8
1818
endif
1919

2020
# Edit the path below to point to the base of your OpenSSL package.

lib/Makefile.Watcom

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ CFLAGS += -dWANT_IDN_PROTOTYPES
8383
!ifdef %zlib_root
8484
ZLIB_ROOT = $(%zlib_root)
8585
!else
86-
ZLIB_ROOT = ..$(DS)..$(DS)zlib-1.2.7
86+
ZLIB_ROOT = ..$(DS)..$(DS)zlib-1.2.8
8787
!endif
8888

8989
!ifdef %libssh2_root

lib/Makefile.b32

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ BCCDIR = $(MAKEDIR)\..
2222

2323
# Edit the path below to point to the base of your Zlib sources.
2424
!ifndef ZLIB_PATH
25-
ZLIB_PATH = ..\..\zlib-1.2.7
25+
ZLIB_PATH = ..\..\zlib-1.2.8
2626
!endif
2727

2828
# Edit the path below to point to the base of your OpenSSL package.

lib/Makefile.m32

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
## Example: mingw32-make -f Makefile.m32 CFG=-zlib-ssl-sspi-winidn
88
##
99
## Hint: you can also set environment vars to control the build, f.e.:
10-
## set ZLIB_PATH=c:/zlib-1.2.7
10+
## set ZLIB_PATH=c:/zlib-1.2.8
1111
## set ZLIB=1
1212
#
1313
###########################################################################
1414

1515
# Edit the path below to point to the base of your Zlib sources.
1616
ifndef ZLIB_PATH
17-
ZLIB_PATH = ../../zlib-1.2.7
17+
ZLIB_PATH = ../../zlib-1.2.8
1818
endif
1919
# Edit the path below to point to the base of your OpenSSL package.
2020
ifndef OPENSSL_PATH

lib/Makefile.netware

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ endif
1414

1515
# Edit the path below to point to the base of your Zlib sources.
1616
ifndef ZLIB_PATH
17-
ZLIB_PATH = ../../zlib-1.2.7
17+
ZLIB_PATH = ../../zlib-1.2.8
1818
endif
1919

2020
# Edit the path below to point to the base of your OpenSSL package.

lib/Makefile.vc6

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ LIBSSH2_PATH = ../../libssh2-1.4.3
7373
!ENDIF
7474

7575
!IFNDEF ZLIB_PATH
76-
ZLIB_PATH = ../../zlib-1.2.7
76+
ZLIB_PATH = ../../zlib-1.2.8
7777
!ENDIF
7878

7979
!IFNDEF MACHINE

lib/Makefile.vxworks

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ USER_CFLAGS:=
3535
# directories where to seek for includes and libraries
3636
OPENSSL_INC := D:/libraries/openssl/openssl-0.9.8y-vxWorks6.3/include
3737
OPENSSL_LIB := D:/libraries/openssl/openssl-0.9.8y-vxWorks6.3
38-
ZLIB_INC := D:/libraries/zlib/zlib-1.2.7-VxWorks6.3/zlib-1.2.7
39-
ZLIB_LIB := D:/libraries/zlib/zlib-1.2.7-VxWorks6.3/binaries/vxworks_3.1_gnu/Debug/lib
38+
ZLIB_INC := D:/libraries/zlib/zlib-1.2.8-VxWorks6.3/zlib-1.2.8
39+
ZLIB_LIB := D:/libraries/zlib/zlib-1.2.8-VxWorks6.3/binaries/vxworks_3.1_gnu/Debug/lib
4040
ARES_INC :=
4141
ARES_LIB :=
4242

src/Makefile.Watcom

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ CFLAGS += -d_WIN32_WINNT=0x0501 -dENABLE_IPV6
7272
!ifdef %zlib_root
7373
ZLIB_ROOT = $(%zlib_root)
7474
!else
75-
ZLIB_ROOT = ..$(DS)..$(DS)zlib-1.2.7
75+
ZLIB_ROOT = ..$(DS)..$(DS)zlib-1.2.8
7676
!endif
7777

7878
!ifdef %libssh2_root

src/Makefile.b32

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ BCCDIR = $(MAKEDIR)\..
2222

2323
# Edit the path below to point to the base of your Zlib sources.
2424
!ifndef ZLIB_PATH
25-
ZLIB_PATH = ..\..\zlib-1.2.7
25+
ZLIB_PATH = ..\..\zlib-1.2.8
2626
!endif
2727

2828
# Edit the path below to point to the base of your OpenSSL package.

src/Makefile.m32

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
## Example: mingw32-make -f Makefile.m32 CFG=-zlib-ssl-spi-winidn
88
##
99
## Hint: you can also set environment vars to control the build, f.e.:
10-
## set ZLIB_PATH=c:/zlib-1.2.7
10+
## set ZLIB_PATH=c:/zlib-1.2.8
1111
## set ZLIB=1
1212
#
1313
###########################################################################
1414

1515
# Edit the path below to point to the base of your Zlib sources.
1616
ifndef ZLIB_PATH
17-
ZLIB_PATH = ../../zlib-1.2.7
17+
ZLIB_PATH = ../../zlib-1.2.8
1818
endif
1919
# Edit the path below to point to the base of your OpenSSL package.
2020
ifndef OPENSSL_PATH

src/Makefile.netware

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ endif
1414

1515
# Edit the path below to point to the base of your Zlib sources.
1616
ifndef ZLIB_PATH
17-
ZLIB_PATH = ../../zlib-1.2.7
17+
ZLIB_PATH = ../../zlib-1.2.8
1818
endif
1919

2020
# Edit the path below to point to the base of your OpenSSL package.

src/Makefile.vc6

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ OPENSSL_PATH = ../../openssl-0.9.8y
6060
!ENDIF
6161

6262
!IFNDEF ZLIB_PATH
63-
ZLIB_PATH = ../../zlib-1.2.7
63+
ZLIB_PATH = ../../zlib-1.2.8
6464
!ENDIF
6565

6666
!IFNDEF MACHINE

0 commit comments

Comments
 (0)