From 4515d06465da15340c56d5b4f14ab4950fd59baa Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 26 Feb 2004 16:23:28 +0000 Subject: David Byron's fixes to make the latest curl build fine under MSVC 6. --- lib/Makefile.vc6 | 6 +++--- lib/config-win32.h | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6 index e1deba6b8..d84f17f3b 100644 --- a/lib/Makefile.vc6 +++ b/lib/Makefile.vc6 @@ -43,10 +43,10 @@ OPENSSL_PATH = ../../openssl-0.9.7a 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" -CFLAGS = /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 +LNKLIB = link.exe /lib LFLAGS = /nologo LINKLIBS = ws2_32.lib winmm.lib SSLLIBS = libeay32.lib ssleay32.lib @@ -170,7 +170,7 @@ RESOURCE = $(DIROBJ)\libcurl.res # Usage # !IF "$(CFGSET)" == "FALSE" -!MESSAGE Usage: nmake -f makefile.vc6 CFG= +!MESSAGE Usage: nmake /f makefile.vc6 CFG= !MESSAGE where is one of: !MESSAGE release - release static library !MESSAGE release-dll - release dll diff --git a/lib/config-win32.h b/lib/config-win32.h index 63847426d..d6665896d 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -32,6 +32,10 @@ #endif /* The size of a `curl_off_t', as computed by sizeof. */ +#ifdef SIZEOF_CURL_OFF_T +#undef SIZEOF_CURL_OFF_T +#endif + #define SIZEOF_CURL_OFF_T 8 /* Define if you have the ANSI C header files. */ -- cgit v1.2.3