diff options
| author | Gisle Vanem <gvanem@broadpark.no> | 2004-11-09 14:00:56 +0000 |
|---|---|---|
| committer | Gisle Vanem <gvanem@broadpark.no> | 2004-11-09 14:00:56 +0000 |
| commit | 377e43fbb9ff48fc114c9c6ecc1b04796e01b0fb (patch) | |
| tree | e483830193250422ae04aba8ce38538a3872cc24 /lib/Makefile.vc6 | |
| parent | 1f2b042b9538ca6a8aef75679e7e66a274cc0063 (diff) | |
Changes for removing libcurl.def file on Win32.
Added "CURL_EXTERN" to memdebug.h functions.
Cleaned up Makefile.vc6.
Diffstat (limited to 'lib/Makefile.vc6')
| -rw-r--r-- | lib/Makefile.vc6 | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6 index 1436bb310..45e679dc3 100644 --- a/lib/Makefile.vc6 +++ b/lib/Makefile.vc6 @@ -39,20 +39,20 @@ USEMM_LIBS = YES #############################################################
## Nothing more to do below this line!
-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"
-LNKDLL = link.exe /DLL /def:libcurl.def
+CCNODBG = cl.exe /MD /O2 /DNDEBUG
+CCDEBUG = cl.exe /MDd /Od /Gm /Zi /D_DEBUG /GZ
+CFLAGSSSL = /DUSE_SSLEAY /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"
+CFLAGSZLIB = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)"
+CFLAGS = /I. /I../include /nologo /W3 /GX /DWIN32 /DVC6 /D_MBCS /D_LIB /YX /FD /c /DBUILDING_LIBCURL
+LNKDLL = link.exe /DLL
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"
+WINLIBS = wsock32.lib
+CFLAGS = $(CFLAGS) /DWITHOUT_MM_LIB
!ENDIF
# RSAglue.lib was formerly needed in the SSLLIBS
CFGSET = FALSE
@@ -112,7 +112,7 @@ TARGET =$(LIB_NAME).dll DIROBJ =.\$(CFG)
LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll"
LNK = $(LNKDLL) $(WINLIBS) $(SSLLIBS) $(WINLIBS) $(LFLAGSSSL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib"
-CC = $(CCNODBG) $(CFLAGSSSL)
+CC = $(CCNODBG) $(CFLAGSSSL)
CFGSET = TRUE
RESOURCE = $(DIROBJ)\libcurl.res
!ENDIF
@@ -136,7 +136,7 @@ TARGET =$(LIB_NAME).lib DIROBJ =.\$(CFG)
LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll"
LNK = $(LNKLIB) $(SSLLIBS) $(LFLAGSSSL) /out:$(TARGET)
-CC = $(CCNODBG) $(CFLAGSSSL)
+CC = $(CCNODBG) $(CFLAGSSSL)
CFGSET = TRUE
RESOURCE = $(DIROBJ)\libcurl.res
!ENDIF
@@ -272,6 +272,7 @@ X_OBJS= \ $(DIROBJ)\http_negotiate.obj \
$(DIROBJ)\http_ntlm.obj \
$(DIROBJ)\md5.obj \
+ $(DIROBJ)\memdebug.obj \
$(DIROBJ)\strerror.obj \
$(DIROBJ)\content_encoding.obj \
$(RESOURCE)
|