From ae26ee3489588f07a882a1f3fed18652a22ded90 Mon Sep 17 00:00:00 2001 From: Guenter Knauf Date: Sat, 11 May 2013 17:08:00 +0200 Subject: Updated zlib version in build files. --- lib/Makefile.Watcom | 2 +- lib/Makefile.b32 | 2 +- lib/Makefile.m32 | 4 ++-- lib/Makefile.netware | 2 +- lib/Makefile.vc6 | 2 +- lib/Makefile.vxworks | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom index ff991dc31..b77536531 100644 --- a/lib/Makefile.Watcom +++ b/lib/Makefile.Watcom @@ -83,7 +83,7 @@ CFLAGS += -dWANT_IDN_PROTOTYPES !ifdef %zlib_root ZLIB_ROOT = $(%zlib_root) !else -ZLIB_ROOT = ..$(DS)..$(DS)zlib-1.2.7 +ZLIB_ROOT = ..$(DS)..$(DS)zlib-1.2.8 !endif !ifdef %libssh2_root diff --git a/lib/Makefile.b32 b/lib/Makefile.b32 index fbd584fb6..86251ba0b 100644 --- a/lib/Makefile.b32 +++ b/lib/Makefile.b32 @@ -22,7 +22,7 @@ BCCDIR = $(MAKEDIR)\.. # Edit the path below to point to the base of your Zlib sources. !ifndef ZLIB_PATH -ZLIB_PATH = ..\..\zlib-1.2.7 +ZLIB_PATH = ..\..\zlib-1.2.8 !endif # Edit the path below to point to the base of your OpenSSL package. diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 index 3df923a72..a401c71f6 100644 --- a/lib/Makefile.m32 +++ b/lib/Makefile.m32 @@ -7,14 +7,14 @@ ## Example: mingw32-make -f Makefile.m32 CFG=-zlib-ssl-sspi-winidn ## ## Hint: you can also set environment vars to control the build, f.e.: -## set ZLIB_PATH=c:/zlib-1.2.7 +## set ZLIB_PATH=c:/zlib-1.2.8 ## set ZLIB=1 # ########################################################################### # Edit the path below to point to the base of your Zlib sources. ifndef ZLIB_PATH -ZLIB_PATH = ../../zlib-1.2.7 +ZLIB_PATH = ../../zlib-1.2.8 endif # Edit the path below to point to the base of your OpenSSL package. ifndef OPENSSL_PATH diff --git a/lib/Makefile.netware b/lib/Makefile.netware index cd87c8d18..058047bb2 100644 --- a/lib/Makefile.netware +++ b/lib/Makefile.netware @@ -14,7 +14,7 @@ endif # Edit the path below to point to the base of your Zlib sources. ifndef ZLIB_PATH -ZLIB_PATH = ../../zlib-1.2.7 +ZLIB_PATH = ../../zlib-1.2.8 endif # Edit the path below to point to the base of your OpenSSL package. diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6 index 18dfbb97c..f22e0c355 100644 --- a/lib/Makefile.vc6 +++ b/lib/Makefile.vc6 @@ -73,7 +73,7 @@ LIBSSH2_PATH = ../../libssh2-1.4.3 !ENDIF !IFNDEF ZLIB_PATH -ZLIB_PATH = ../../zlib-1.2.7 +ZLIB_PATH = ../../zlib-1.2.8 !ENDIF !IFNDEF MACHINE diff --git a/lib/Makefile.vxworks b/lib/Makefile.vxworks index 0860df8e7..0f9de51ed 100644 --- a/lib/Makefile.vxworks +++ b/lib/Makefile.vxworks @@ -35,8 +35,8 @@ USER_CFLAGS:= # directories where to seek for includes and libraries OPENSSL_INC := D:/libraries/openssl/openssl-0.9.8y-vxWorks6.3/include OPENSSL_LIB := D:/libraries/openssl/openssl-0.9.8y-vxWorks6.3 -ZLIB_INC := D:/libraries/zlib/zlib-1.2.7-VxWorks6.3/zlib-1.2.7 -ZLIB_LIB := D:/libraries/zlib/zlib-1.2.7-VxWorks6.3/binaries/vxworks_3.1_gnu/Debug/lib +ZLIB_INC := D:/libraries/zlib/zlib-1.2.8-VxWorks6.3/zlib-1.2.8 +ZLIB_LIB := D:/libraries/zlib/zlib-1.2.8-VxWorks6.3/binaries/vxworks_3.1_gnu/Debug/lib ARES_INC := ARES_LIB := -- cgit v1.2.3