]> granicus.if.org Git - curl/commitdiff
fixed linkage dll targets. (submitted by Casey O'Donnell)
authorGunter Knauf <gk@gknw.de>
Sat, 14 Aug 2004 22:03:40 +0000 (22:03 +0000)
committerGunter Knauf <gk@gknw.de>
Sat, 14 Aug 2004 22:03:40 +0000 (22:03 +0000)
lib/Makefile.vc6

index 5296dbe0425b1755d36d005c2b9c66df100e19c9..239a855384d956e834b8cb5704fb7419d8408d59 100644 (file)
@@ -86,7 +86,7 @@ CFGSET   = TRUE
 !IF "$(CFG)" == "release-dll"\r
 TARGET =$(LIB_NAME).dll\r
 DIROBJ =.\$(CFG)\r
-LNK    = $(LNKDLL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib"\r
+LNK    = $(LNKDLL) $(WINLIBS) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib"\r
 CC     = $(CCNODBG)\r
 CFGSET = TRUE\r
 RESOURCE = $(DIROBJ)\libcurl.res\r
@@ -111,7 +111,7 @@ CFGSET   = TRUE
 TARGET   =$(LIB_NAME).dll\r
 DIROBJ   =.\$(CFG)\r
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll"\r
-LNK      = $(LNKDLL) $(SSLLIBS) $(WINLIBS) $(LFLAGSSSL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib"\r
+LNK      = $(LNKDLL) $(WINLIBS) $(SSLLIBS) $(WINLIBS) $(LFLAGSSSL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib"\r
 CC       = $(CCNODBG)  $(CFLAGSSSL)\r
 CFGSET   = TRUE\r
 RESOURCE = $(DIROBJ)\libcurl.res\r
@@ -159,7 +159,7 @@ CFGSET = TRUE
 !IF "$(CFG)" == "debug-dll"\r
 TARGET =$(LIB_NAME_DEBUG).dll\r
 DIROBJ =.\$(CFG)\r
-LNK    = $(LNKDLL) /DEBUG /out:$(TARGET) /IMPLIB:"$(LIB_NAME_DEBUG).lib" /PDB:"$(LIB_NAME_DEBUG).pdb"\r
+LNK    = $(LNKDLL) $(WINLIBS) /DEBUG /out:$(TARGET) /IMPLIB:"$(LIB_NAME_DEBUG).lib" /PDB:"$(LIB_NAME_DEBUG).pdb"\r
 CC     = $(CCDEBUG)\r
 CFGSET = TRUE\r
 RESOURCE = $(DIROBJ)\libcurl.res\r
@@ -194,7 +194,7 @@ CFGSET   = TRUE
 TARGET   =$(LIB_NAME_DEBUG).dll\r
 DIROBJ   =.\$(CFG)\r
 LFLAGSSSL = /LIBPATH:$(OPENSSL_PATH)/out32dll\r
-LNK      = $(LNKDLL) $(LFLAGSSSL) /DEBUG /out:$(TARGET) /IMPLIB:"$(LIB_NAME_DEBUG).lib" /PDB:"$(LIB_NAME_DEBUG).pdb"\r
+LNK      = $(LNKDLL) $(WINLIBS) $(LFLAGSSSL) /DEBUG /out:$(TARGET) /IMPLIB:"$(LIB_NAME_DEBUG).lib" /PDB:"$(LIB_NAME_DEBUG).pdb"\r
 CC       = $(CCDEBUG) $(CFLAGSSSL)\r
 CFGSET   = TRUE\r
 RESOURCE = $(DIROBJ)\libcurl.res\r