← Back to branch summary

~ubuntu-branches/ubuntu/lucid/curl/lucid-201101212007

« back to all changes in this revision

Viewing changes to lib/Makefile.vc6

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2008-06-18 15:21:57 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20080618152157-qq94aiequcq35w6b
Tags: 7.18.2-1ubuntu1
* Merge from debian unstable, remaining changes:
  - Drop the stunnel build dependency.
  - Drop the build-dependency on libdb4.5-dev
  - Add build-dependency on openssh-server
  - Drop libssh2-1-dev from libcurl4-openssl-dev's Depends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/Makefile.vc6
58
58
# It can be downloaded from:
59
59
# http://www.microsoft.com/msdownload/platformsdk/sdkupdate/
60
60
 
61
 
# USE_WINDOWS_SSPI = 1
 
61
# WINDOWS_SSPI = 1
62
62
 
63
63
!IFDEF WINDOWS_SSPI
64
64
!IFNDEF WINDOWS_SDK_PATH
66
66
!ENDIF
67
67
!ENDIF
68
68
 
69
 
# Use the high resolution time by default.  Comment this out to use low
70
 
# resolution time and not require winmm.lib
71
 
USEMM_LIBS = YES
72
 
 
73
69
#############################################################
74
70
## Nothing more to do below this line!
75
71
 
85
81
SSLLIBS    = libeay32.lib ssleay32.lib
86
82
ZLIBLIBSDLL= zdll.lib
87
83
ZLIBLIBS   = zlib.lib
88
 
!IFDEF USEMM_LIBS
89
 
WINLIBS    = wsock32.lib wldap32.lib winmm.lib
90
 
!ELSE
91
84
WINLIBS    = wsock32.lib wldap32.lib
92
 
CFLAGS     = $(CFLAGS) /DWITHOUT_MM_LIB
93
 
!ENDIF
94
 
#  RSAglue.lib was formerly needed in the SSLLIBS
 
85
CFLAGS     = $(CFLAGS)
 
86
 
95
87
CFGSET     = FALSE
96
88
 
97
89
!IFDEF WINDOWS_SSPI
165
157
DIROBJ   = $(CFG)
166
158
LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"
167
159
LNK      = $(LNKLIB) $(WINLIBS) $(SSLLIBS) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET)
168
 
CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL)
 
160
CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSLIB)
169
161
CFGSET   = TRUE
170
162
!ENDIF
171
163