diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2004-05-25 13:52:12 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2004-05-25 13:52:12 +0000 |
| commit | f6319bd706ec1bcd4aefd84ff72265ad51562e3d (patch) | |
| tree | 82881709786986563eb67f81cdd60e31a96387de /lib | |
| parent | 0912015a5c34ade7acad04db43604f781cd8306e (diff) | |
Massimiliano Ziccardi's updates for the VC6 makefiles
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.vc6 | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6 index ceb3fe01c..9fc484940 100644 --- a/lib/Makefile.vc6 +++ b/lib/Makefile.vc6 @@ -39,12 +39,17 @@ CCNODBG = cl.exe /MD /O2 /D "NDEBUG" CCDEBUG = cl.exe /MDd /Od /Gm /Zi /D "_DEBUG" /GZ
CFLAGSSSL = /D "USE_SSLEAY" /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"
CFLAGSZLIB = /D "HAVE_ZLIB_H" /D "HAVE_ZLIB" /D "HAVE_LIBZ" /I "$(ZLIB_PATH)"
-CFLAGS = /I "." /I "../include" /nologo /W3 /GX /D "WIN32" /D "VC6" /D "_MBCS" /D "_LIB" /YX /FD /c /D "MSDOS"
-
+CFLAGS = /I "." /I "../include" /nologo /W3 /GX /D "WIN32" /D "VC6" /D "_MBCS" /D "_LIB" /YX /FD /c /D "MSDOS"
LNKDLL = link.exe /DLL /def:libcurl.def
LNKLIB = link.exe /lib
LFLAGS = /nologo
SSLLIBS = libeay32.lib ssleay32.lib
+!IFDEF USEMM_LIBS
+WINLIBS = wsock32.lib winmm.lib
+!ELSE
+WINLIBS = wsock32.lib
+CFLAGS = $(CFLAGS) /D "WITHOUT_MM_LIB"
+!ENDIF
# RSAglue.lib was formerly needed in the SSLLIBS
CFGSET = FALSE
@@ -90,7 +95,7 @@ CFGSET = TRUE TARGET =$(LIB_NAME).dll
DIROBJ =.\$(CFG)
LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll"
-LNK = $(LNKDLL) $(LFLAGSSSL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib"
+LNK = $(LNKDLL) $(SSLLIBS) $(WINLIBS) $(LFLAGSSSL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib"
CC = $(CCNODBG) $(CFLAGSSSL)
CFGSET = TRUE
RESOURCE = $(DIROBJ)\libcurl.res
@@ -98,7 +103,6 @@ RESOURCE = $(DIROBJ)\libcurl.res ######################
# release-ssl-zlib
-
!IF "$(CFG)" == "release-ssl-zlib"
TARGET =$(LIB_NAME).lib
DIROBJ =.\$(CFG)
@@ -115,7 +119,7 @@ CFGSET = TRUE TARGET =$(LIB_NAME).lib
DIROBJ =.\$(CFG)
LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll"
-LNK = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET)
+LNK = $(LNKLIB) $(SSLLIBS) $(LFLAGSSSL) /out:$(TARGET)
CC = $(CCNODBG) $(CFLAGSSSL)
CFGSET = TRUE
RESOURCE = $(DIROBJ)\libcurl.res
|