moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

winbuild: add config option ENABLE_NGHTTP2

Browse Source 
Closes #1141
This commit is contained in:
Jan-E 2016-11-25 06:06:14 +01:00 committed by Daniel Stenberg
parent a6618b5250
commit 65894c9846
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
winbuild/Makefile.vc
View File

@ -21,6 +21,8 @@ CFGSET=true
!MESSAGE Libraries can be fetched at http://pecl2.php.net/downloads/php-windows-builds/ !MESSAGE Libraries can be fetched at http://pecl2.php.net/downloads/php-windows-builds/
!MESSAGE Uncompress them into the deps folder. !MESSAGE Uncompress them into the deps folder.
!MESSAGE WITH_SSL=<dll or static> - Enable OpenSSL support, DLL or static !MESSAGE WITH_SSL=<dll or static> - Enable OpenSSL support, DLL or static
!MESSAGE ENABLE_NGHTTP2=<yes or no> - Enable HTTP/2 support, defaults to no
!MESSAGE Requires OpenSSL
!MESSAGE WITH_CARES=<dll or static> - Enable c-ares support, DLL or static !MESSAGE WITH_CARES=<dll or static> - Enable c-ares support, DLL or static
!MESSAGE WITH_ZLIB=<dll or static> - Enable zlib support, DLL or static !MESSAGE WITH_ZLIB=<dll or static> - Enable zlib support, DLL or static
!MESSAGE WITH_SSH2=<dll or static> - Enable libSSH2 support, DLL or static !MESSAGE WITH_SSH2=<dll or static> - Enable libSSH2 support, DLL or static
@ -109,6 +111,16 @@ USE_SSL = true
SSL = static SSL = static
!ENDIF !ENDIF
!IF "$(USE_SSL)"=="true"
!IF "$(ENABLE_NGHTTP2)"=="yes"
USE_NGHTTP2 = true
!ENDIF
!ENDIF
!IFNDEF USE_NGHTTP2
USE_NGHTTP2 = false
!ENDIF
!IF "$(WITH_MBEDTLS)"=="dll" || "$(WITH_MBEDTLS)"=="static" !IF "$(WITH_MBEDTLS)"=="dll" || "$(WITH_MBEDTLS)"=="static"
USE_MBEDTLS = true USE_MBEDTLS = true
MBEDTLS = $(WITH_MBEDTLS) MBEDTLS = $(WITH_MBEDTLS)
@ -213,6 +225,7 @@ $(MODE):
@SET CONFIG_NAME_LIB=$(CONFIG_NAME_LIB) @SET CONFIG_NAME_LIB=$(CONFIG_NAME_LIB)
@SET MACHINE=$(MACHINE) @SET MACHINE=$(MACHINE)
@SET USE_NGHTTP2=$(USE_NGHTTP2)
@SET USE_IDN=$(USE_IDN) @SET USE_IDN=$(USE_IDN)
@SET USE_IPV6=$(USE_IPV6) @SET USE_IPV6=$(USE_IPV6)
@SET USE_SSPI=$(USE_SSPI) @SET USE_SSPI=$(USE_SSPI)

15
winbuild/MakefileBuild.vc
View File

@ -123,8 +123,22 @@ USE_SSL = true
SSL = static SSL = static
!ENDIF !ENDIF
!IFNDEF USE_NGHTTP2
USE_NGHTTP2 = false
!ENDIF
!IFDEF USE_SSL !IFDEF USE_SSL
SSL_CFLAGS = /DUSE_OPENSSL /I"$(DEVEL_INCLUDE)/openssl" SSL_CFLAGS = /DUSE_OPENSSL /I"$(DEVEL_INCLUDE)/openssl"
!IF "$(USE_NGHTTP2)"=="yes"
USE_NGHTTP2 = true
!ENDIF
!IF "$(USE_NGHTTP2)"=="true"
SSL_CFLAGS = $(SSL_CFLAGS) /DUSE_NGHTTP2
SSL_LIBS = $(SSL_LIBS) nghttp2.lib
!ENDIF
!ENDIF !ENDIF
!IF "$(WITH_MBEDTLS)"=="dll" || "$(WITH_MBEDTLS)"=="static" !IF "$(WITH_MBEDTLS)"=="dll" || "$(WITH_MBEDTLS)"=="static"
@ -416,6 +430,7 @@ package: $(TARGET)
$(TARGET): $(LIB_OBJS) $(LIB_DIROBJ) $(DISTDIR) $(TARGET): $(LIB_OBJS) $(LIB_DIROBJ) $(DISTDIR)
@echo Using SSL: $(USE_SSL) @echo Using SSL: $(USE_SSL)
@echo Using NGHTTP2: $(USE_NGHTTP2)
@echo Using c-ares: $(USE_CARES) @echo Using c-ares: $(USE_CARES)
@echo Using SSH2: $(USE_SSH2) @echo Using SSH2: $(USE_SSH2)
@echo Using ZLIB: $(USE_ZLIB) @echo Using ZLIB: $(USE_ZLIB)