snow/curl-w32
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

changes for w2k

Browse source
This commit is contained in:
snow flurry 2024-03-01 19:57:27 -08:00
parent 999d4d533f
commit 4c1b14b59a
3 changed files with 36 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/config-win32.h
View file

@ -380,9 +380,10 @@ Vista
#endif
/* Windows XP is required for freeaddrinfo, getaddrinfo */
#define HAVE_FREEADDRINFO 1
#define HAVE_GETADDRINFO 1
#define HAVE_GETADDRINFO_THREADSAFE 1
// #define HAVE_FREEADDRINFO 1
// #define HAVE_GETADDRINFO 1
// #define HAVE_GETADDRINFO_THREADSAFE 1
#define Curl_addrinfo_set_port(x,y)
/* ---------------------------------------------------------------- */
/* STRUCT RELATED */
@ -397,12 +398,14 @@ Vista
/* Define if struct sockaddr_in6 has the sin6_scope_id member. */
#define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1
#define ADDRESS_FAMILY USHORT
/* ---------------------------------------------------------------- */
/* LARGE FILE SUPPORT */
/* ---------------------------------------------------------------- */
#if defined(_MSC_VER) && !defined(_WIN32_WCE)
# if (_MSC_VER >= 900) && (_INTEGRAL_MAX_BITS >= 64)
# if (_MSC_VER >= 1500) && (_INTEGRAL_MAX_BITS >= 64)
# define USE_WIN32_LARGE_FILES
# else
# define USE_WIN32_SMALL_FILES

25
winbuild/MakefileBuild.vc
View file

@ -52,7 +52,7 @@ CFLAGS = /I. /I../lib /I../include /nologo /W4 /GX /DWIN32 /YX /FD /c /DBUI
!ELSE
CC_NODEBUG = $(CC) /O2 /DNDEBUG
CC_DEBUG = $(CC) /Od /D_DEBUG /RTC1 /Z7 /LDd
CFLAGS = /I. /I ../lib /I../include /nologo /W4 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL
CFLAGS = /I. /I ../lib /I../include /nologo /W4 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL /D_WIN32_WINNT=0x0400 /DWINVER=0x0400 /wd4214
!ENDIF
LFLAGS = /nologo /machine:$(MACHINE)
@ -201,6 +201,23 @@ MBEDTLS_LIBS = mbedtls.lib mbedcrypto.lib mbedx509.lib
!ENDIF
!IFDEF WOLFSSL_PATH
WOLFSSL_INC_DIR = $(WOLFSSL_PATH)\include
WOLFSSL_LIB_DIR = $(WOLFSSL_PATH)\lib
WOLFSSL_LFLAGS = $(WOLFSSL_LFLAGS) "/LIBPATH:$(WOLFSSL_LIB_DIR)"
!ELSE
WOLFSSL_INC_DIR = $(DEVEL_INCLUDE)
WOLFSSL_LIB_DIR = $(DEVEL_LIB)
!ENDIF
!IF "$(WITH_WOLFSSL)"=="dll" || "$(WITH_WOLFSSL)"=="static"
USE_WOLFSSL = true
WOLFSSL = $(WITH_WOLFSSL)
WOLFSSL_CFLAGS = /DUSE_WOLFSSL /I"$(WOLFSSL_INC_DIR)"
WOLFSSL_LIBS = wolfssl.lib
!ENDIF
!IFDEF CARES_PATH
CARES_INC_DIR = $(CARES_PATH)\include
CARES_LIB_DIR = $(CARES_PATH)\lib
@ -363,7 +380,6 @@ USE_SSPI = true
SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_WINDOWS_SSPI
!ENDIF
!IFNDEF USE_SCHANNEL
!IF "$(USE_SSL)"=="true"
USE_SCHANNEL = false
@ -476,6 +492,11 @@ CFLAGS = $(CFLAGS) $(MBEDTLS_CFLAGS)
LFLAGS = $(LFLAGS) $(MBEDTLS_LFLAGS) $(MBEDTLS_LIBS)
!ENDIF
!IF "$(USE_WOLFSSL)"=="true"
CFLAGS = $(CFLAGS) $(WOLFSSL_CFLAGS)
LFLAGS = $(LFLAGS) $(WOLFSSL_LFLAGS) $(WOLFSSL_LIBS)
!ENDIF
!IF "$(USE_CARES)"=="true"
CFLAGS = $(CFLAGS) $(CARES_CFLAGS)
LFLAGS = $(LFLAGS) $(CARES_LFLAGS) $(CARES_LIBS)

7
winbuild/gen_resp_file.bat
View file

@ -28,7 +28,12 @@ if exist %OUTFILE% (
)
echo %MACRO_NAME% = \> %OUTFILE%
for %%i in (%*) do echo %DIROBJ%/%%i \>> %OUTFILE%
:loop
IF [%1] == [] GOTO done
echo %DIROBJ%/%1 \>> %OUTFILE%
SHIFT
GOTO loop
:done
echo. >> %OUTFILE%
:END