Imported Upstream version 7.53.1

[platform/upstream/curl.git] / winbuild / MakefileBuild.vc

diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 3b4fc10..96ab37e 100644 (file)
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -123,8 +123,22 @@ USE_SSL      = true
 SSL          = static\r
 !ENDIF\r
 \r
+!IFNDEF USE_NGHTTP2\r
+USE_NGHTTP2  = false\r
+!ENDIF\r
+\r
 !IFDEF USE_SSL\r
 SSL_CFLAGS   = /DUSE_OPENSSL /I"$(DEVEL_INCLUDE)/openssl"\r
+\r
+!IF "$(USE_NGHTTP2)"=="yes"\r
+USE_NGHTTP2  = true\r
+!ENDIF\r
+\r
+!IF "$(USE_NGHTTP2)"=="true"\r
+SSL_CFLAGS   = $(SSL_CFLAGS) /DUSE_NGHTTP2\r
+SSL_LIBS     = $(SSL_LIBS) nghttp2.lib\r
+!ENDIF\r
+\r
 !ENDIF\r
 \r
 !IF "$(WITH_MBEDTLS)"=="dll" || "$(WITH_MBEDTLS)"=="static"\r
@@ -416,6 +430,7 @@ package: $(TARGET)
 \r
 $(TARGET): $(LIB_OBJS) $(LIB_DIROBJ) $(DISTDIR)\r
        @echo Using SSL: $(USE_SSL)\r
+       @echo Using NGHTTP2: $(USE_NGHTTP2)\r
        @echo Using c-ares: $(USE_CARES)\r
        @echo Using SSH2: $(USE_SSH2)\r
        @echo Using ZLIB: $(USE_ZLIB)\r
@@ -494,7 +509,6 @@ CURL_LIBCURL_LIBNAME=$(LIB_NAME_IMP)
 \r
 CURL_FROM_LIBCURL=$(CURL_DIROBJ)\tool_hugehelp.obj \\r
  $(CURL_DIROBJ)\nonblock.obj \\r
- $(CURL_DIROBJ)\rawstr.obj \\r
  $(CURL_DIROBJ)\strtoofft.obj \\r
  $(CURL_DIROBJ)\warnless.obj\r
  \r
@@ -509,8 +523,6 @@ $(CURL_DIROBJ)\tool_hugehelp.obj: $(CURL_SRC_DIR)\tool_hugehelp.c
        $(CURL_CC) $(CURL_CFLAGS) /Zm200 /Fo"$@" $(CURL_SRC_DIR)\tool_hugehelp.c\r
 $(CURL_DIROBJ)\nonblock.obj: ../lib/nonblock.c\r
        $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/nonblock.c\r
-$(CURL_DIROBJ)\rawstr.obj: ../lib/rawstr.c\r
-       $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/rawstr.c\r
 $(CURL_DIROBJ)\strtoofft.obj: ../lib/strtoofft.c\r
        $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/strtoofft.c\r
 $(CURL_DIROBJ)\warnless.obj: ../lib/warnless.c\r