mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-01-18 14:04:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updated dependency lib versions.

Browse Source
This commit is contained in:
Guenter Knauf 2012-04-20 13:33:54 +02:00
parent 5cd524df18
commit 0f54880277
14 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/INSTALL
View File

@ -218,7 +218,7 @@ Win32
environment variables, for example: environment variables, for example:
set ZLIB_PATH=c:\zlib-1.2.6 set ZLIB_PATH=c:\zlib-1.2.6
set OPENSSL_PATH=c:\openssl-0.9.8u set OPENSSL_PATH=c:\openssl-0.9.8v
set LIBSSH2_PATH=c:\libssh2-1.4.1 set LIBSSH2_PATH=c:\libssh2-1.4.1
ATTENTION: if you want to build with libssh2 support you have to use latest ATTENTION: if you want to build with libssh2 support you have to use latest
@ -334,7 +334,7 @@ Win32
Before running nmake define the OPENSSL_PATH environment variable with Before running nmake define the OPENSSL_PATH environment variable with
the root/base directory of OpenSSL, for example: the root/base directory of OpenSSL, for example:
set OPENSSL_PATH=c:\openssl-0.9.8u set OPENSSL_PATH=c:\openssl-0.9.8v
Then run 'nmake vc-ssl' or 'nmake vc-ssl-dll' in curl's root Then run 'nmake vc-ssl' or 'nmake vc-ssl-dll' in curl's root
directory. 'nmake vc-ssl' will create a libcurl static and dynamic directory. 'nmake vc-ssl' will create a libcurl static and dynamic

8
docs/examples/Makefile.m32
View File

@ -27,18 +27,18 @@
## Example: mingw32-make -f Makefile.m32 CFG=-zlib-ssl-spi-winidn ## Example: mingw32-make -f Makefile.m32 CFG=-zlib-ssl-spi-winidn
## ##
## Hint: you can also set environment vars to control the build, f.e.: ## Hint: you can also set environment vars to control the build, f.e.:
## set ZLIB_PATH=c:/zlib-1.2.5 ## set ZLIB_PATH=c:/zlib-1.2.6
## set ZLIB=1 ## set ZLIB=1
# #
########################################################################### ###########################################################################
# Edit the path below to point to the base of your Zlib sources. # Edit the path below to point to the base of your Zlib sources.
ifndef ZLIB_PATH ifndef ZLIB_PATH
ZLIB_PATH = ../../../zlib-1.2.5 ZLIB_PATH = ../../../zlib-1.2.6
endif endif
# Edit the path below to point to the base of your OpenSSL package. # Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH ifndef OPENSSL_PATH
OPENSSL_PATH = ../../../openssl-0.9.8r OPENSSL_PATH = ../../../openssl-0.9.8v
endif endif
ifndef OPENSSL_LIBPATH ifndef OPENSSL_LIBPATH
OPENSSL_LIBPATH = $(OPENSSL_PATH)/out OPENSSL_LIBPATH = $(OPENSSL_PATH)/out
@ -48,7 +48,7 @@ OPENSSL_LIBS = -leay32 -lssl32
endif endif
# Edit the path below to point to the base of your LibSSH2 package. # Edit the path below to point to the base of your LibSSH2 package.
ifndef LIBSSH2_PATH ifndef LIBSSH2_PATH
LIBSSH2_PATH = ../../../libssh2-1.3.0 LIBSSH2_PATH = ../../../libssh2-1.4.1
endif endif
# Edit the path below to point to the base of your librtmp package. # Edit the path below to point to the base of your librtmp package.
ifndef LIBRTMP_PATH ifndef LIBRTMP_PATH

6
docs/examples/Makefile.netware
View File

@ -14,17 +14,17 @@ endif
# Edit the path below to point to the base of your Zlib sources. # Edit the path below to point to the base of your Zlib sources.
ifndef ZLIB_PATH ifndef ZLIB_PATH
ZLIB_PATH = ../../../zlib-1.2.5 ZLIB_PATH = ../../../zlib-1.2.6
endif endif
# Edit the path below to point to the base of your OpenSSL package. # Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH ifndef OPENSSL_PATH
OPENSSL_PATH = ../../../openssl-0.9.8r OPENSSL_PATH = ../../../openssl-0.9.8v
endif endif
# Edit the path below to point to the base of your LibSSH2 package. # Edit the path below to point to the base of your LibSSH2 package.
ifndef LIBSSH2_PATH ifndef LIBSSH2_PATH
LIBSSH2_PATH = ../../../libssh2-1.3.0 LIBSSH2_PATH = ../../../libssh2-1.4.1
endif endif
# Edit the path below to point to the base of your axTLS package. # Edit the path below to point to the base of your axTLS package.

2
lib/Makefile.Watcom
View File

@ -101,7 +101,7 @@ LIBRTMP_ROOT = ..$(DS)..$(DS)rtmpdump-2.3
!ifdef %openssl_root !ifdef %openssl_root
OPENSSL_ROOT = $(%openssl_root) OPENSSL_ROOT = $(%openssl_root)
!else !else
OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8u OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8v
!endif !endif
!ifdef %ares_root !ifdef %ares_root

4
lib/Makefile.b32
View File

@ -22,12 +22,12 @@ BCCDIR = $(MAKEDIR)\..
# Edit the path below to point to the base of your Zlib sources. # Edit the path below to point to the base of your Zlib sources.
!ifndef ZLIB_PATH !ifndef ZLIB_PATH
ZLIB_PATH = ..\..\zlib-1.2.5 ZLIB_PATH = ..\..\zlib-1.2.6
!endif !endif
# Edit the path below to point to the base of your OpenSSL package. # Edit the path below to point to the base of your OpenSSL package.
!ifndef OPENSSL_PATH !ifndef OPENSSL_PATH
OPENSSL_PATH = ..\..\openssl-0.9.8q OPENSSL_PATH = ..\..\openssl-0.9.8v
!endif !endif
# Set libcurl static lib, dll and import lib # Set libcurl static lib, dll and import lib

2
lib/Makefile.m32
View File

@ -18,7 +18,7 @@ ZLIB_PATH = ../../zlib-1.2.6
endif endif
# Edit the path below to point to the base of your OpenSSL package. # Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH ifndef OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.8u OPENSSL_PATH = ../../openssl-0.9.8v
endif endif
ifndef OPENSSL_INCLUDE ifndef OPENSSL_INCLUDE
OPENSSL_INCLUDE = $(OPENSSL_PATH)/outinc OPENSSL_INCLUDE = $(OPENSSL_PATH)/outinc

2
lib/Makefile.netware
View File

@ -19,7 +19,7 @@ endif
# Edit the path below to point to the base of your OpenSSL package. # Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH ifndef OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.8u OPENSSL_PATH = ../../openssl-0.9.8v
endif endif
# Edit the path below to point to the base of your LibSSH2 package. # Edit the path below to point to the base of your LibSSH2 package.

2
lib/Makefile.vc6
View File

@ -65,7 +65,7 @@
!INCLUDE ..\Makefile.msvc.names !INCLUDE ..\Makefile.msvc.names
!IFNDEF OPENSSL_PATH !IFNDEF OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.8u OPENSSL_PATH = ../../openssl-0.9.8v
!ENDIF !ENDIF
!IFNDEF LIBSSH2_PATH !IFNDEF LIBSSH2_PATH

8
lib/Makefile.vxworks
View File

@ -33,10 +33,10 @@ BUILD_TYPE := debug
USER_CFLAGS:= USER_CFLAGS:=
# directories where to seek for includes and libraries # directories where to seek for includes and libraries
OPENSSL_INC := D:/libraries/openssl/openssl-0.9.8a-vxWorks6.3/include OPENSSL_INC := D:/libraries/openssl/openssl-0.9.8v-vxWorks6.3/include
OPENSSL_LIB := D:/libraries/openssl/openssl-0.9.8a-vxWorks6.3 OPENSSL_LIB := D:/libraries/openssl/openssl-0.9.8v-vxWorks6.3
ZLIB_INC := D:/libraries/zlib/zlib-1.2.3-VxWorks6.3/zlib-1.2.3 ZLIB_INC := D:/libraries/zlib/zlib-1.2.6-VxWorks6.3/zlib-1.2.6
ZLIB_LIB := D:/libraries/zlib/zlib-1.2.3-VxWorks6.3/binaries/vxworks_3.1_gnu/Debug/lib ZLIB_LIB := D:/libraries/zlib/zlib-1.2.6-VxWorks6.3/binaries/vxworks_3.1_gnu/Debug/lib
ARES_INC := ARES_INC :=
ARES_LIB := ARES_LIB :=

2
src/Makefile.Watcom
View File

@ -90,7 +90,7 @@ LIBRTMP_ROOT = ..$(DS)..$(DS)rtmpdump-2.3
!ifdef %openssl_root !ifdef %openssl_root
OPENSSL_ROOT = $(%openssl_root) OPENSSL_ROOT = $(%openssl_root)
!else !else
OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8u OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8v
!endif !endif
!ifdef %ares_root !ifdef %ares_root

4
src/Makefile.b32
View File

@ -22,12 +22,12 @@ BCCDIR = $(MAKEDIR)\..
# Edit the path below to point to the base of your Zlib sources. # Edit the path below to point to the base of your Zlib sources.
!ifndef ZLIB_PATH !ifndef ZLIB_PATH
ZLIB_PATH = ..\..\zlib-1.2.5 ZLIB_PATH = ..\..\zlib-1.2.6
!endif !endif
# Edit the path below to point to the base of your OpenSSL package. # Edit the path below to point to the base of your OpenSSL package.
!ifndef OPENSSL_PATH !ifndef OPENSSL_PATH
OPENSSL_PATH = ..\..\openssl-0.9.8q OPENSSL_PATH = ..\..\openssl-0.9.8v
!endif !endif
# Set program's name # Set program's name

2
src/Makefile.m32
View File

@ -18,7 +18,7 @@ ZLIB_PATH = ../../zlib-1.2.6
endif endif
# Edit the path below to point to the base of your OpenSSL package. # Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH ifndef OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.8u OPENSSL_PATH = ../../openssl-0.9.8v
endif endif
ifndef OPENSSL_LIBPATH ifndef OPENSSL_LIBPATH
OPENSSL_LIBPATH = $(OPENSSL_PATH)/out OPENSSL_LIBPATH = $(OPENSSL_PATH)/out

2
src/Makefile.netware
View File

@ -19,7 +19,7 @@ endif
# Edit the path below to point to the base of your OpenSSL package. # Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH ifndef OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.8u OPENSSL_PATH = ../../openssl-0.9.8v
endif endif
# Edit the path below to point to the base of your LibSSH2 package. # Edit the path below to point to the base of your LibSSH2 package.

2
src/Makefile.vc6
View File

@ -57,7 +57,7 @@ PROGRAM_NAME = curl.exe
!IFNDEF OPENSSL_PATH !IFNDEF OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.8u OPENSSL_PATH = ../../openssl-0.9.8v
!ENDIF !ENDIF
!IFNDEF ZLIB_PATH !IFNDEF ZLIB_PATH