make users use the latest OpenSSL and Zlib libraries;
added hint to compile with SSPI with MSVC6 without PSDK.
This commit is contained in:
@@ -1,4 +1,5 @@
|
|||||||
#############################################################
|
#############################################################
|
||||||
|
# $Id: Makefile.vc6,v 1.19 2004/11/14 13:48:15 giva Exp $
|
||||||
#
|
#
|
||||||
# Makefile for building libcurl with MSVC6
|
# Makefile for building libcurl with MSVC6
|
||||||
#
|
#
|
||||||
@@ -34,11 +35,11 @@ IMPLIB_NAME = libcurl_imp
|
|||||||
IMPLIB_NAME_DEBUG = libcurld_imp
|
IMPLIB_NAME_DEBUG = libcurld_imp
|
||||||
|
|
||||||
!IFNDEF OPENSSL_PATH
|
!IFNDEF OPENSSL_PATH
|
||||||
OPENSSL_PATH = ../../openssl-0.9.7e
|
OPENSSL_PATH = ../../openssl-0.9.8e
|
||||||
!ENDIF
|
!ENDIF
|
||||||
|
|
||||||
!IFNDEF ZLIB_PATH
|
!IFNDEF ZLIB_PATH
|
||||||
ZLIB_PATH = ../../zlib-1.2.1
|
ZLIB_PATH = ../../zlib-1.2.3
|
||||||
!ENDIF
|
!ENDIF
|
||||||
|
|
||||||
!IFNDEF MACHINE
|
!IFNDEF MACHINE
|
||||||
@@ -47,8 +48,10 @@ MACHINE = X86
|
|||||||
|
|
||||||
# USE_WINDOWS_SSPI uses windows libraries to allow NTLM authentication
|
# USE_WINDOWS_SSPI uses windows libraries to allow NTLM authentication
|
||||||
# without an openssl installation and offers the ability to authenticate
|
# without an openssl installation and offers the ability to authenticate
|
||||||
# using the "current logged in user". It does however require that the
|
# using the "current logged in user". Since at least with MSVC6 the sspi.h
|
||||||
# Windows SDK be installed.
|
# header is broken it is either required to install the Windows SDK,
|
||||||
|
# or to fix sspi.h with adding this define at the beginning of sspi.h:
|
||||||
|
# #define FreeCredentialHandle FreeCredentialsHandle
|
||||||
#
|
#
|
||||||
# If, for some reason the Windows SDK is installed but not installed
|
# If, for some reason the Windows SDK is installed but not installed
|
||||||
# in the default location, you can specify WINDOWS_SDK_PATH.
|
# in the default location, you can specify WINDOWS_SDK_PATH.
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
########################################################
|
#############################################################
|
||||||
# $Id: Makefile.vc6,v 1.19 2004/11/14 13:48:15 giva Exp $
|
# $Id: Makefile.vc6,v 1.19 2004/11/14 13:48:15 giva Exp $
|
||||||
#
|
#
|
||||||
## Makefile for building curl.exe with MSVC6
|
## Makefile for building curl.exe with MSVC6
|
||||||
@@ -10,17 +10,19 @@
|
|||||||
## Comments to: Troy Engel <tengel@sonic.net>
|
## Comments to: Troy Engel <tengel@sonic.net>
|
||||||
## Updated by: Craig Davison <cd@securityfocus.com>
|
## Updated by: Craig Davison <cd@securityfocus.com>
|
||||||
## release-ssl added by Miklos Nemeth <mnemeth@kfkisystems.com>
|
## release-ssl added by Miklos Nemeth <mnemeth@kfkisystems.com>
|
||||||
## winmm.lib added by Miklos Nemeth <mnemeth@kfkisystems.com> to support
|
## winmm.lib added by Miklos Nemeth <mnemeth@kfkisystems.com> to
|
||||||
## timeGetTime() in curlutil.c
|
## support timeGetTime() in curlutil.c
|
||||||
|
#
|
||||||
|
#############################################################
|
||||||
|
|
||||||
PROGRAM_NAME = curl.exe
|
PROGRAM_NAME = curl.exe
|
||||||
|
|
||||||
!IFNDEF ZLIB_PATH
|
!IFNDEF ZLIB_PATH
|
||||||
ZLIB_PATH = ../../zlib-1.2.1
|
ZLIB_PATH = ../../zlib-1.2.3
|
||||||
!ENDIF
|
!ENDIF
|
||||||
|
|
||||||
!IFNDEF OPENSSL_PATH
|
!IFNDEF OPENSSL_PATH
|
||||||
OPENSSL_PATH = ../../openssl-0.9.7e
|
OPENSSL_PATH = ../../openssl-0.9.8e
|
||||||
!ENDIF
|
!ENDIF
|
||||||
|
|
||||||
!IFNDEF MACHINE
|
!IFNDEF MACHINE
|
||||||
@@ -29,8 +31,10 @@ MACHINE = X86
|
|||||||
|
|
||||||
# USE_WINDOWS_SSPI uses windows libraries to allow NTLM authentication
|
# USE_WINDOWS_SSPI uses windows libraries to allow NTLM authentication
|
||||||
# without an openssl installation and offers the ability to authenticate
|
# without an openssl installation and offers the ability to authenticate
|
||||||
# using the "current logged in user". It does however require that the
|
# using the "current logged in user". Since at least with MSVC6 the sspi.h
|
||||||
# Windows SDK be installed.
|
# header is broken it is either required to install the Windows SDK,
|
||||||
|
# or to fix sspi.h with adding this define at the beginning of sspi.h:
|
||||||
|
# #define FreeCredentialHandle FreeCredentialsHandle
|
||||||
#
|
#
|
||||||
# If, for some reason the Windows SDK is installed but not installed
|
# If, for some reason the Windows SDK is installed but not installed
|
||||||
# in the default location, you can specify WINDOWS_SDK_PATH.
|
# in the default location, you can specify WINDOWS_SDK_PATH.
|
||||||
|
|||||||
Reference in New Issue
Block a user