diff options
| author | taesub kim <taesub.kim@samsung.com> | 2017-03-22 14:21:38 +0900 |
|---|---|---|
| committer | taesub kim <taesub.kim@samsung.com> | 2017-03-22 14:22:18 +0900 |
| commit | e9bdad71c8277e20607fa1eaf0027d53a0dc1f37 (patch) | |
| tree | e260727dc080e910dfea79203509fdc4f32ed852 /winbuild/Makefile.vc | |
| parent | 3e62527ed71a7a362d7ec321e7f026edab35f8e2 (diff) | |
| download | curl-e9bdad71c8277e20607fa1eaf0027d53a0dc1f37.tar.gz curl-e9bdad71c8277e20607fa1eaf0027d53a0dc1f37.tar.bz2 curl-e9bdad71c8277e20607fa1eaf0027d53a0dc1f37.zip | |
Imported Upstream version 7.53.1
Change-Id: I575eb99bf2face4938a57889412327e285116bf3
Diffstat (limited to 'winbuild/Makefile.vc')
| -rw-r--r-- | winbuild/Makefile.vc | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc index bd5c8e032..f78da4343 100644 --- a/winbuild/Makefile.vc +++ b/winbuild/Makefile.vc @@ -21,6 +21,8 @@ CFGSET=true !MESSAGE Libraries can be fetched at http://pecl2.php.net/downloads/php-windows-builds/ !MESSAGE Uncompress them into the deps folder. !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_ZLIB=<dll or static> - Enable zlib support, DLL or static !MESSAGE WITH_SSH2=<dll or static> - Enable libSSH2 support, DLL or static @@ -55,7 +57,10 @@ ENABLE_SSPI = $(USE_SSPI) !ENDIF # default options + !IFNDEF MACHINE +# Note: nmake magically changes the value of PROCESSOR_ARCHITECTURE from "AMD64" +# to "x86" when building in a 32 bit build environment on a 64 bit machine. !IF "$(PROCESSOR_ARCHITECTURE)"=="AMD64" MACHINE = x64 !ELSE @@ -109,6 +114,16 @@ USE_SSL = true SSL = static !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" USE_MBEDTLS = true MBEDTLS = $(WITH_MBEDTLS) @@ -213,6 +228,7 @@ $(MODE): @SET CONFIG_NAME_LIB=$(CONFIG_NAME_LIB) @SET MACHINE=$(MACHINE) + @SET USE_NGHTTP2=$(USE_NGHTTP2) @SET USE_IDN=$(USE_IDN) @SET USE_IPV6=$(USE_IPV6) @SET USE_SSPI=$(USE_SSPI) |