diff options
| author | Thomas Gamper <icicle@cg.tuwien.ac.at> | 2019-06-16 15:38:13 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2019-06-17 13:39:51 +0200 |
| commit | 672ff597e500e38cda87aee60de655acbbc22ed7 (patch) | |
| tree | 2b3a2ad4bc6460c78e23f0a0dbaa821154c17aea | |
| parent | 03a22a26c6f9bb5fe122f7b61b508486c2a03f32 (diff) | |
winbuild: use WITH_PREFIX if given
Closes #4031
| -rw-r--r-- | winbuild/BUILD.WINDOWS.txt | 1 | ||||
| -rw-r--r-- | winbuild/Makefile.vc | 6 | ||||
| -rw-r--r-- | winbuild/MakefileBuild.vc | 9 |
3 files changed, 13 insertions, 3 deletions
diff --git a/winbuild/BUILD.WINDOWS.txt b/winbuild/BUILD.WINDOWS.txt index c75b15c4e..1ede14f01 100644 --- a/winbuild/BUILD.WINDOWS.txt +++ b/winbuild/BUILD.WINDOWS.txt @@ -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
diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc index 26ab90693..f5c0c7b00 100644 --- a/winbuild/Makefile.vc +++ b/winbuild/Makefile.vc @@ -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 diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc index 8d942b759..993ab38bc 100644 --- a/winbuild/MakefileBuild.vc +++ b/winbuild/MakefileBuild.vc @@ -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
|