moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

winbuild: use WITH_PREFIX if given 

Closes #4031
This commit is contained in:
Thomas Gamper 2019-06-16 15:38:13 +02:00 committed by Daniel Stenberg
parent 03a22a26c6
commit 672ff597e5
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
winbuild/BUILD.WINDOWS.txt
View File

@ -86,6 +86,7 @@ where <options> is one or many of:
WITH_CARES=<dll or static> - Enable c-ares support, DLL or static
WITH_ZLIB=<dll or static> - Enable zlib support, DLL or static
WITH_SSH2=<dll or static> - Enable libSSH2 support, DLL or static
WITH_PREFIX=<dir> - Where to install the build
ENABLE_SSPI=<yes or no> - Enable SSPI support, defaults to yes
ENABLE_IPV6=<yes or no> - Enable IPv6, defaults to yes
ENABLE_IDN=<yes or no> - Enable use of Windows IDN APIs, defaults to yes

6
winbuild/Makefile.vc
View File

@ -39,9 +39,13 @@ CFGSET=true
!MESSAGE where <options> is one or many of:
!MESSAGE VC=<6,7,8,9,10,11,12,14,15> - VC versions
!MESSAGE WITH_DEVEL=<path> - Paths for the development files (SSL, zlib, etc.)
!MESSAGE Defaults to sibbling directory deps: ../deps
!MESSAGE Defaults to curl's sibling directory deps: ../deps
!MESSAGE Libraries can be fetched at https://windows.php.net/downloads/php-sdk/deps/
!MESSAGE Uncompress them into the deps folder.
!MESSAGE WITH_PREFIX=<path> - Installation directory path
!MESSAGE Defaults to a configuration dependent (SSL, zlib, etc.)
!MESSAGE directory inside curl's subdirectory builds: ./builds
!MESSAGE Use backslashes as path separator
!MESSAGE WITH_SSL=<dll or static> - Enable OpenSSL support, DLL or static
!MESSAGE WITH_NGHTTP2=<dll or static> - Enable HTTP/2 support, DLL or static
!MESSAGE WITH_CARES=<dll or static> - Enable c-ares support, DLL or static

9
winbuild/MakefileBuild.vc
View File

@ -486,8 +486,13 @@ CFLAGS = $(CFLAGS) /DCURL_WITH_MULTI_SSL
!ENDIF
LIB_DIROBJ = ..\builds\$(CONFIG_NAME_LIB)-obj-lib
CURL_DIROBJ = ..\builds\$(CONFIG_NAME_LIB)-obj-curl
DIRDIST = ..\builds\$(CONFIG_NAME_LIB)\
CURL_DIROBJ = ..\builds\$(CONFIG_NAME_LIB)-obj-curl
!IFDEF WITH_PREFIX
DIRDIST = $(WITH_PREFIX)
!ELSE
DIRDIST = ..\builds\$(CONFIG_NAME_LIB)\
!ENDIF
#
# curl.exe