diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2004-03-03 13:32:56 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2004-03-03 13:32:56 +0000 |
| commit | 2479e06848a7625b1b55511b43f86abc3a76c93d (patch) | |
| tree | 5f229a8dad5a33c0d0698e2474b943203b38a5c1 /lib/Makefile.vc6 | |
| parent | f2abe03fcf09acc3727e995c3304dc80caea39f5 (diff) | |
David Byron's work on making libcurl only require winsock 1.1 on Windows
machines.
Diffstat (limited to 'lib/Makefile.vc6')
| -rw-r--r-- | lib/Makefile.vc6 | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6 index d84f17f3b..e9ddd366e 100644 --- a/lib/Makefile.vc6 +++ b/lib/Makefile.vc6 @@ -48,7 +48,6 @@ CFLAGS = /I "." /I "../include" /nologo /W3 /GX /D "WIN32" /D "VC6" /D "_MBCS" / LNKDLL = link.exe /DLL /def:libcurl.def
LNKLIB = link.exe /lib
LFLAGS = /nologo
-LINKLIBS = ws2_32.lib winmm.lib
SSLLIBS = libeay32.lib ssleay32.lib
# RSAglue.lib was formerly needed in the SSLLIBS
CFGSET = FALSE
@@ -84,7 +83,6 @@ TARGET =$(LIB_NAME).lib DIROBJ =.\$(CFG)
LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32"
LNK = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET)
-LINKLIBS = $(LINKLIBS)
CC = $(CCNODBG) $(CFLAGSSSL)
CFGSET = TRUE
!ENDIF
@@ -97,7 +95,6 @@ TARGET =$(LIB_NAME).dll DIROBJ =.\$(CFG)
LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll"
LNK = $(LNKDLL) $(LFLAGSSSL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib"
-LINKLIBS = $(LINKLIBS) $(SSLLIBS)
CC = $(CCNODBG) $(CFLAGSSSL)
CFGSET = TRUE
RESOURCE = $(DIROBJ)\libcurl.res
@@ -110,7 +107,6 @@ TARGET =$(LIB_NAME).lib DIROBJ =.\$(CFG)
LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll"
LNK = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET)
-LINKLIBS = $(LINKLIBS) $(SSLLIBS)
CC = $(CCNODBG) $(CFLAGSSSL)
CFGSET = TRUE
RESOURCE = $(DIROBJ)\libcurl.res
@@ -147,7 +143,6 @@ RESOURCE = $(DIROBJ)\libcurl.res TARGET = $(LIB_NAME_DEBUG).lib
DIROBJ =.\$(CFG)
LNK = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET)
-LINKLIBS = $(LINKLIBS)
CC = $(CCDEBUG) $(CFLAGSSSL)
CFGSET = TRUE
!ENDIF
@@ -160,7 +155,6 @@ TARGET =$(LIB_NAME_DEBUG).dll DIROBJ =.\$(CFG)
LFLAGSSSL = /LIBPATH:$(OPENSSL_PATH)/out32dll
LNK = $(LNKDLL) $(LFLAGSSSL) /DEBUG /out:$(TARGET) /IMPLIB:"$(LIB_NAME_DEBUG).lib" /PDB:"$(LIB_NAME_DEBUG).pdb"
-LINKLIBS = $(LINKLIBS) $(SSLLIBS)
CC = $(CCDEBUG) $(CFLAGSSSL)
CFGSET = TRUE
RESOURCE = $(DIROBJ)\libcurl.res
@@ -234,7 +228,7 @@ all : $(TARGET) $(TARGET): $(X_OBJS)
- $(LNK) $(LFLAGS) $(LINKLIBS) $(X_OBJS)
+ $(LNK) $(LFLAGS) $(X_OBJS)
$(X_OBJS): $(DIROBJ)
|