Skip to content

Commit

Permalink
Updated dependency libs.
Browse files Browse the repository at this point in the history
  • Loading branch information
gknauf committed Feb 9, 2013
1 parent f44d0ae commit 5be2499
Show file tree
Hide file tree
Showing 14 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions docs/INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ Win32
environment variables, for example:

set ZLIB_PATH=c:\zlib-1.2.7
set OPENSSL_PATH=c:\openssl-0.9.8x
set OPENSSL_PATH=c:\openssl-0.9.8y
set LIBSSH2_PATH=c:\libssh2-1.4.3

ATTENTION: if you want to build with libssh2 support you have to use latest
Expand Down Expand Up @@ -337,7 +337,7 @@ Win32
Before running nmake define the OPENSSL_PATH environment variable with
the root/base directory of OpenSSL, for example:

set OPENSSL_PATH=c:\openssl-0.9.8x
set OPENSSL_PATH=c:\openssl-0.9.8y

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
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/Makefile.m32
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ ZLIB_PATH = ../../../zlib-1.2.7
endif
# Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH
OPENSSL_PATH = ../../../openssl-0.9.8x
OPENSSL_PATH = ../../../openssl-0.9.8y
endif
# Edit the path below to point to the base of your LibSSH2 package.
ifndef LIBSSH2_PATH
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/Makefile.netware
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ endif

# Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH
OPENSSL_PATH = ../../../openssl-0.9.8x
OPENSSL_PATH = ../../../openssl-0.9.8y
endif

# Edit the path below to point to the base of your LibSSH2 package.
Expand Down
2 changes: 1 addition & 1 deletion lib/Makefile.Watcom
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ LIBRTMP_ROOT = ..$(DS)..$(DS)rtmpdump-2.3
!ifdef %openssl_root
OPENSSL_ROOT = $(%openssl_root)
!else
OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8x
OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8y
!endif

!ifdef %ares_root
Expand Down
2 changes: 1 addition & 1 deletion lib/Makefile.b32
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ ZLIB_PATH = ..\..\zlib-1.2.7

# Edit the path below to point to the base of your OpenSSL package.
!ifndef OPENSSL_PATH
OPENSSL_PATH = ..\..\openssl-0.9.8x
OPENSSL_PATH = ..\..\openssl-0.9.8y
!endif

# Set libcurl static lib, dll and import lib
Expand Down
2 changes: 1 addition & 1 deletion lib/Makefile.m32
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ZLIB_PATH = ../../zlib-1.2.7
endif
# Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.8x
OPENSSL_PATH = ../../openssl-0.9.8y
endif
# Edit the path below to point to the base of your LibSSH2 package.
ifndef LIBSSH2_PATH
Expand Down
2 changes: 1 addition & 1 deletion lib/Makefile.netware
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ endif

# Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.8x
OPENSSL_PATH = ../../openssl-0.9.8y
endif

# Edit the path below to point to the base of your LibSSH2 package.
Expand Down
2 changes: 1 addition & 1 deletion lib/Makefile.vc6
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
!INCLUDE ..\winbuild\Makefile.msvc.names

!IFNDEF OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.8x
OPENSSL_PATH = ../../openssl-0.9.8y
!ENDIF

!IFNDEF LIBSSH2_PATH
Expand Down
4 changes: 2 additions & 2 deletions lib/Makefile.vxworks
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ BUILD_TYPE := debug
USER_CFLAGS:=

# directories where to seek for includes and libraries
OPENSSL_INC := D:/libraries/openssl/openssl-0.9.8x-vxWorks6.3/include
OPENSSL_LIB := D:/libraries/openssl/openssl-0.9.8x-vxWorks6.3
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
ARES_INC :=
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.Watcom
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ LIBRTMP_ROOT = ..$(DS)..$(DS)rtmpdump-2.3
!ifdef %openssl_root
OPENSSL_ROOT = $(%openssl_root)
!else
OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8x
OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8y
!endif

!ifdef %ares_root
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.b32
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ ZLIB_PATH = ..\..\zlib-1.2.7

# Edit the path below to point to the base of your OpenSSL package.
!ifndef OPENSSL_PATH
OPENSSL_PATH = ..\..\openssl-0.9.8x
OPENSSL_PATH = ..\..\openssl-0.9.8y
!endif

# Set program's name
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.m32
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ZLIB_PATH = ../../zlib-1.2.7
endif
# Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.8x
OPENSSL_PATH = ../../openssl-0.9.8y
endif
# Edit the path below to point to the base of your LibSSH2 package.
ifndef LIBSSH2_PATH
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.netware
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ endif

# Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.8x
OPENSSL_PATH = ../../openssl-0.9.8y
endif

# Edit the path below to point to the base of your LibSSH2 package.
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.vc6
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ PROGRAM_NAME = curl.exe


!IFNDEF OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.8x
OPENSSL_PATH = ../../openssl-0.9.8y
!ENDIF

!IFNDEF ZLIB_PATH
Expand Down

0 comments on commit 5be2499

Please sign in to comment.