romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-26 07:53:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

David Byron's work on making libcurl only require winsock 1.1 on Windows

Browse source 
machines.
This commit is contained in:
Daniel Stenberg 2004-03-03 13:32:56 +00:00
parent f2abe03fcf
commit 2479e06848
7 changed files with 156 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Makefile.vc6
View file

@ -30,8 +30,8 @@ ZLIB_PATH = ../../zlib-1.1.4
CFLAGS = /I "../lib" /I "../include" /I "$(ZLIB_PATH)" /nologo /W3 /GX /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
LFLAGS = /nologo /libpath:"$(ZLIB_PATH)" /out:$(PROGRAM_NAME) /subsystem:console /machine:I386
LINKLIBS = ws2_32.lib libcurl.lib winmm.lib zlib.lib
LINKLIBS_DEBUG = ws2_32.lib libcurld.lib winmm.lib zlib.lib
LINKLIBS = wsock32.lib libcurl.lib winmm.lib zlib.lib
LINKLIBS_DEBUG = wsock32.lib libcurld.lib winmm.lib zlib.lib
RELEASE_OBJS= \
hugehelpr.obj \
@ -58,6 +58,7 @@ OPENSSL_PATH = ../../openssl-0.9.7a
!ENDIF
LFLAGSSSL = /LIBPATH:"$(OPENSSL_PATH)/out32"
SSLLIBS = libeay32.lib ssleay32.lib gdi32.lib
CFLAGS = $(CFLAGS) -DUSE_SSLEAY
LINKLIBS = $(LINKLIBS) $(SSLLIBS)
LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) $(SSLLIBS)
LFLAGS = $(LFLAGS) $(LFLAGSSSL)
@ -100,12 +101,13 @@ maind.obj: main.c
$(CCD) $(CFLAGS) /Fo"$@" main.c
clean:
-@erase homedir.obj
-@erase hugehelp.obj
-@erase main.obj
-@erase $(RELEASE_OBJS)
-@erase $(DEBUG_OBJS)
-@erase vc60.idb
-@erase vc60.pdb
-@erase vc60.pch
-@erase vc70.idb
-@erase vc70.pch
-@erase curl.ilk
-@erase curl.pdb

7
src/main.c
View file

@ -2647,8 +2647,11 @@ operate(struct Configurable *config, int argc, char *argv[])
errorbuffer[0]=0; /* prevent junk from being output */
main_init(); /* inits */
/* inits */
if (main_init() != CURLE_OK) {
helpf("error initializing curl library\n");
return CURLE_FAILED_INIT;
}
config->showerror=TRUE;
config->conf=CONF_DEFAULT;
config->use_httpget=FALSE;