Skip to content

Commit

Permalink
Updated dependency libary versions.
Browse files Browse the repository at this point in the history
  • Loading branch information
gknauf committed May 22, 2012
1 parent e07b11b commit 9a7311b
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions nw/Makefile.netware
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ endif

# Edit the path below to point to the base of your Zlib sources.
ifndef ZLIB_PATH
ZLIB_PATH = ../../zlib-1.2.6
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.8v
OPENSSL_PATH = ../../openssl-0.9.8x
endif

# Edit the path below to point to your Distribution folder.
Expand Down
4 changes: 2 additions & 2 deletions nw/test/Makefile.netware
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ endif

# Edit the path below to point to the base of your Zlib sources.
ifndef ZLIB_PATH
ZLIB_PATH = ../../../zlib-1.2.6
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.8v
OPENSSL_PATH = ../../../openssl-0.9.8x
endif

# Edit the var below to enable static linking of libssh2 and libz
Expand Down
4 changes: 2 additions & 2 deletions win32/GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@

# Edit the path below to point to the base of your Zlib sources.
ifndef ZLIB_PATH
ZLIB_PATH = ../../zlib-1.2.6
ZLIB_PATH = ../../zlib-1.2.7
endif
# since currently always enabled in libssh2_config.h set here too!
WITH_ZLIB = 1

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

# Edit the var below to set to your architecture or set environment var.
Expand Down
4 changes: 2 additions & 2 deletions win32/Makefile.Watcom
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,13 @@ CFLAGS += -d_WIN32_WINNT=0x0501 -dENABLE_IPV6
!ifdef %zlib_root
ZLIB_ROOT = $(%zlib_root)
!else
ZLIB_ROOT = ..\..\zlib-1.2.6
ZLIB_ROOT = ..\..\zlib-1.2.7
!endif

!ifdef %openssl_root
OPENSSL_ROOT = $(%openssl_root)
!else
OPENSSL_ROOT = ..\..\openssl-0.9.8v
OPENSSL_ROOT = ..\..\openssl-0.9.8x
!endif

#!ifdef %use_zlib
Expand Down
8 changes: 4 additions & 4 deletions win32/config.mk
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@

# Tweak these for your system
OPENSSLINC=..\openssl-0.9.8v\inc32
OPENSSLLIB=..\openssl-0.9.8v\out32dll
OPENSSLINC=..\openssl-0.9.8x\inc32
OPENSSLLIB=..\openssl-0.9.8x\out32dll

ZLIBINC=-DLIBSSH2_HAVE_ZLIB=1 /I..\zlib-1.2.6
ZLIBLIB=..\zlib-1.2.6
ZLIBINC=-DLIBSSH2_HAVE_ZLIB=1 /I..\zlib-1.2.7
ZLIBLIB=..\zlib-1.2.7

!if "$(TARGET)" == ""
TARGET=Release
Expand Down
4 changes: 2 additions & 2 deletions win32/test/GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@

# Edit the path below to point to the base of your Zlib sources.
ifndef ZLIB_PATH
ZLIB_PATH = ../../../zlib-1.2.6
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.8v
OPENSSL_PATH = ../../../openssl-0.9.8x
endif

# Edit the var below to set to your architecture or set environment var.
Expand Down

0 comments on commit 9a7311b

Please sign in to comment.