mirror of
https://github.com/moparisthebest/curl
synced 2024-08-13 17:03:50 -04:00
Added the use of Watt-32 tcp/ip stack for Win32 target.
If USE_WATT32=1 one needs to use stack-based calls (-3s). So to keep the makefile nice and clean, specify -3s for Winsock target too (there's hardly any speed-gain using -3r).
This commit is contained in:
parent
bd55ab05bd
commit
77c1d556bb
@ -8,7 +8,7 @@ TARGETS = libcurl_wc.dll libcurl_wc_imp.lib libcurl_wc.lib
|
|||||||
|
|
||||||
CC = wcc386
|
CC = wcc386
|
||||||
|
|
||||||
CFLAGS = -3r -mf -d3 -hc -zff -zgf -zq -zm -zc -s -fr=con -w2 -fpi -oilrtfm -bt=nt &
|
CFLAGS = -3s -mf -d3 -hc -zff -zgf -zq -zm -zc -s -fr=con -w2 -fpi -oilrtfm -bt=nt &
|
||||||
-bd -d+ -dWIN32 -dCURL_CA_BUNDLE=getenv("CURL_CA_BUNDLE") &
|
-bd -d+ -dWIN32 -dCURL_CA_BUNDLE=getenv("CURL_CA_BUNDLE") &
|
||||||
-dBUILDING_LIBCURL -dHAVE_SPNEGO=1 -dENABLE_IPV6 &
|
-dBUILDING_LIBCURL -dHAVE_SPNEGO=1 -dENABLE_IPV6 &
|
||||||
-dDEBUG=1 -dCURLDEBUG -d_WIN32_WINNT=0x0501 -dWINBERAPI=__declspec(cdecl) &
|
-dDEBUG=1 -dCURLDEBUG -d_WIN32_WINNT=0x0501 -dWINBERAPI=__declspec(cdecl) &
|
||||||
@ -17,9 +17,10 @@ CFLAGS = -3r -mf -d3 -hc -zff -zgf -zq -zm -zc -s -fr=con -w2 -fpi -oilrtfm -bt=
|
|||||||
#
|
#
|
||||||
# Change to suite.
|
# Change to suite.
|
||||||
#
|
#
|
||||||
ZLIB_ROOT = ..\..\..\zlib-1.2.3
|
ZLIB_ROOT = ..\..\..\zlib-1.2.3
|
||||||
USE_ZLIB = 0
|
USE_ZLIB = 0
|
||||||
USE_ARES = 0
|
USE_ARES = 0
|
||||||
|
USE_WATT32 = 0
|
||||||
|
|
||||||
!ifeq USE_ZLIB 1
|
!ifeq USE_ZLIB 1
|
||||||
CFLAGS += -dHAVE_ZLIB_H -dHAVE_LIBZ -I$(ZLIB_ROOT)
|
CFLAGS += -dHAVE_ZLIB_H -dHAVE_LIBZ -I$(ZLIB_ROOT)
|
||||||
@ -29,6 +30,10 @@ CFLAGS += -dHAVE_ZLIB_H -dHAVE_LIBZ -I$(ZLIB_ROOT)
|
|||||||
CFLAGS += -dUSE_ARES -I..\ares
|
CFLAGS += -dUSE_ARES -I..\ares
|
||||||
!endif
|
!endif
|
||||||
|
|
||||||
|
!ifeq USE_WATT32 1
|
||||||
|
CFLAGS += -dUSE_WATT32 -I$(%watt_root)\inc
|
||||||
|
!endif
|
||||||
|
|
||||||
OBJ_BASE = WC_Win32.obj
|
OBJ_BASE = WC_Win32.obj
|
||||||
C_ARG = $(OBJ_BASE)\wcc386.arg
|
C_ARG = $(OBJ_BASE)\wcc386.arg
|
||||||
LINK_ARG = $(OBJ_BASE)\dyn\wlink.arg
|
LINK_ARG = $(OBJ_BASE)\dyn\wlink.arg
|
||||||
@ -121,7 +126,12 @@ $(LINK_ARG): $(__MAKEFILES__)
|
|||||||
@%append $^@ file { $(OBJS_DYN) }
|
@%append $^@ file { $(OBJS_DYN) }
|
||||||
@%append $^@ option quiet, map, caseexact, eliminate, implib=libcurl_wc_imp.lib,
|
@%append $^@ option quiet, map, caseexact, eliminate, implib=libcurl_wc_imp.lib,
|
||||||
@%append $^@ res=$(RESOURCE) libpath $(%watcom)\lib386;$(%watcom)\lib386\nt
|
@%append $^@ res=$(RESOURCE) libpath $(%watcom)\lib386;$(%watcom)\lib386\nt
|
||||||
@%append $^@ library clib3r.lib, wldap32.lib, ws2_32.lib
|
@%append $^@ library clib3s.lib, wldap32.lib
|
||||||
|
!ifeq USE_WATT32 1
|
||||||
|
@%append $^@ library $(%watt_root)\lib\wattcpw_imp.lib
|
||||||
|
!else
|
||||||
|
@%append $^@ library ws2_32.lib
|
||||||
|
!endif
|
||||||
!ifeq USE_ZLIB 1
|
!ifeq USE_ZLIB 1
|
||||||
@%append $^@ library $(ZLIB_ROOT)\zlib.lib
|
@%append $^@ library $(ZLIB_ROOT)\zlib.lib
|
||||||
!endif
|
!endif
|
||||||
|
Loading…
Reference in New Issue
Block a user