diff options
| author | Anatol Belski <ab@php.net> | 2017-03-10 12:59:36 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-05-24 08:27:12 +0200 |
| commit | df45f2c33e1c916d62d7f5e794c6015fc3b51c01 (patch) | |
| tree | 59f5d2ac1055801193c7da9a872521f86b4e2dba /winbuild/MakefileBuild.vc | |
| parent | 63cd0d60ea24a7c7de4289a4240d40fa4ac46ff2 (diff) | |
winbuild: fix the nghttp2 build
Closes #1321
Diffstat (limited to 'winbuild/MakefileBuild.vc')
| -rw-r--r-- | winbuild/MakefileBuild.vc | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc index f8296718b..83f92374e 100644 --- a/winbuild/MakefileBuild.vc +++ b/winbuild/MakefileBuild.vc @@ -131,22 +131,16 @@ USE_SSL = true SSL = static
!ENDIF
-!IFNDEF USE_NGHTTP2
-USE_NGHTTP2 = false
-!ENDIF
-
!IFDEF USE_SSL
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
+!IF "$(WITH_NGHTTP2)"=="dll"
+NGHTTP2_CFLAGS = /DUSE_NGHTTP2
+NGHTTP2_LIBS = nghttp2.lib
+!ELSEIF "$(WITH_NGHTTP2)"=="static"
+NGHTTP2_CFLAGS = /DUSE_NGHTTP2 /DNGHTTP2_STATICLIB
+NGHTTP2_LIBS = nghttp2_static.lib
!ENDIF
!IF "$(WITH_MBEDTLS)"=="dll" || "$(WITH_MBEDTLS)"=="static"
@@ -381,6 +375,11 @@ CFLAGS = $(CFLAGS) $(IPV6_CFLAGS) CFLAGS = $(CFLAGS) $(SSPI_CFLAGS)
!ENDIF
+!IF "$(USE_NGHTTP2)"=="true"
+CFLAGS = $(CFLAGS) $(NGHTTP2_CFLAGS)
+LFLAGS = $(LFLAGS) $(NGHTTP2_LFLAGS) $(NGHTTP2_LIBS)
+!ENDIF
+
!IF "$(GEN_PDB)"=="true"
CFLAGS = $(CFLAGS) $(CFLAGS_PDB) /Fd"$(LIB_DIROBJ)\$(PDB)"
LFLAGS = $(LFLAGS) $(LFLAGS_PDB)
|