1
0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00

Updated dependency lib versions.

This commit is contained in:
Guenter Knauf 2012-04-26 14:40:50 +02:00
parent 72b72fe8ed
commit 1beda0cbb7
14 changed files with 16 additions and 16 deletions

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.8v set OPENSSL_PATH=c:\openssl-0.9.8w
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.8v set OPENSSL_PATH=c:\openssl-0.9.8w
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

View File

@ -38,7 +38,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.8v OPENSSL_PATH = ../../../openssl-0.9.8w
endif endif
ifndef OPENSSL_LIBPATH ifndef OPENSSL_LIBPATH
OPENSSL_LIBPATH = $(OPENSSL_PATH)/out OPENSSL_LIBPATH = $(OPENSSL_PATH)/out

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.8v OPENSSL_PATH = ../../../openssl-0.9.8w
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.

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.8v OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8w
!endif !endif
!ifdef %ares_root !ifdef %ares_root

View File

@ -27,7 +27,7 @@ ZLIB_PATH = ..\..\zlib-1.2.6
# 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.8v OPENSSL_PATH = ..\..\openssl-0.9.8w
!endif !endif
# Set libcurl static lib, dll and import lib # Set libcurl static lib, dll and import lib

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.8v OPENSSL_PATH = ../../openssl-0.9.8w
endif endif
ifndef OPENSSL_INCLUDE ifndef OPENSSL_INCLUDE
OPENSSL_INCLUDE = $(OPENSSL_PATH)/outinc OPENSSL_INCLUDE = $(OPENSSL_PATH)/outinc

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.8v OPENSSL_PATH = ../../openssl-0.9.8w
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.

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.8v OPENSSL_PATH = ../../openssl-0.9.8w
!ENDIF !ENDIF
!IFNDEF LIBSSH2_PATH !IFNDEF LIBSSH2_PATH

View File

@ -33,8 +33,8 @@ 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.8v-vxWorks6.3/include OPENSSL_INC := D:/libraries/openssl/openssl-0.9.8w-vxWorks6.3/include
OPENSSL_LIB := D:/libraries/openssl/openssl-0.9.8v-vxWorks6.3 OPENSSL_LIB := D:/libraries/openssl/openssl-0.9.8w-vxWorks6.3
ZLIB_INC := D:/libraries/zlib/zlib-1.2.6-VxWorks6.3/zlib-1.2.6 ZLIB_INC := D:/libraries/zlib/zlib-1.2.6-VxWorks6.3/zlib-1.2.6
ZLIB_LIB := D:/libraries/zlib/zlib-1.2.6-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 :=

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.8v OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8w
!endif !endif
!ifdef %ares_root !ifdef %ares_root

View File

@ -27,7 +27,7 @@ ZLIB_PATH = ..\..\zlib-1.2.6
# 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.8v OPENSSL_PATH = ..\..\openssl-0.9.8w
!endif !endif
# Set program's name # Set program's name

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.8v OPENSSL_PATH = ../../openssl-0.9.8w
endif endif
ifndef OPENSSL_LIBPATH ifndef OPENSSL_LIBPATH
OPENSSL_LIBPATH = $(OPENSSL_PATH)/out OPENSSL_LIBPATH = $(OPENSSL_PATH)/out

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.8v OPENSSL_PATH = ../../openssl-0.9.8w
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.

View File

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