From 559553b169f03d12347d045feade4aa5c115294f Mon Sep 17 00:00:00 2001 From: Gunter Knauf Date: Sat, 14 Aug 2004 22:03:40 +0000 Subject: fixed linkage dll targets. (submitted by Casey O'Donnell) --- lib/Makefile.vc6 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6 index 5296dbe04..239a85538 100644 --- a/lib/Makefile.vc6 +++ b/lib/Makefile.vc6 @@ -86,7 +86,7 @@ CFGSET = TRUE !IF "$(CFG)" == "release-dll" TARGET =$(LIB_NAME).dll DIROBJ =.\$(CFG) -LNK = $(LNKDLL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib" +LNK = $(LNKDLL) $(WINLIBS) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib" CC = $(CCNODBG) CFGSET = TRUE RESOURCE = $(DIROBJ)\libcurl.res @@ -111,7 +111,7 @@ CFGSET = TRUE TARGET =$(LIB_NAME).dll DIROBJ =.\$(CFG) LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll" -LNK = $(LNKDLL) $(SSLLIBS) $(WINLIBS) $(LFLAGSSSL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib" +LNK = $(LNKDLL) $(WINLIBS) $(SSLLIBS) $(WINLIBS) $(LFLAGSSSL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib" CC = $(CCNODBG) $(CFLAGSSSL) CFGSET = TRUE RESOURCE = $(DIROBJ)\libcurl.res @@ -159,7 +159,7 @@ CFGSET = TRUE !IF "$(CFG)" == "debug-dll" TARGET =$(LIB_NAME_DEBUG).dll DIROBJ =.\$(CFG) -LNK = $(LNKDLL) /DEBUG /out:$(TARGET) /IMPLIB:"$(LIB_NAME_DEBUG).lib" /PDB:"$(LIB_NAME_DEBUG).pdb" +LNK = $(LNKDLL) $(WINLIBS) /DEBUG /out:$(TARGET) /IMPLIB:"$(LIB_NAME_DEBUG).lib" /PDB:"$(LIB_NAME_DEBUG).pdb" CC = $(CCDEBUG) CFGSET = TRUE RESOURCE = $(DIROBJ)\libcurl.res @@ -194,7 +194,7 @@ CFGSET = TRUE 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" +LNK = $(LNKDLL) $(WINLIBS) $(LFLAGSSSL) /DEBUG /out:$(TARGET) /IMPLIB:"$(LIB_NAME_DEBUG).lib" /PDB:"$(LIB_NAME_DEBUG).pdb" CC = $(CCDEBUG) $(CFLAGSSSL) CFGSET = TRUE RESOURCE = $(DIROBJ)\libcurl.res -- cgit v1.2.3