summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2014-01-05 21:13:12 +0000
committerSteve Holme <steve_holme@hotmail.com>2014-01-05 21:13:12 +0000
commitfca7930dfa401426bbadc2e78ac08a716e455b89 (patch)
tree29355d79e9d283b020620bec999a8aa4893d78f5
parente9c0f1f658a570db539aafb3100cd886136963f3 (diff)
downloadcurl-fca7930dfa401426bbadc2e78ac08a716e455b89.tar.gz
Makefile: Added missing WinSSL and x64 configurations
-rw-r--r--Makefile.dist26
-rw-r--r--lib/Makefile.vc612
2 files changed, 37 insertions, 1 deletions
diff --git a/Makefile.dist b/Makefile.dist
index 3efb8ebef..c8152fb55 100644
--- a/Makefile.dist
+++ b/Makefile.dist
@@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@@ -136,12 +136,36 @@ vc-zlib: $(VC)
cd ..\src
nmake /f Makefile.$(VC) cfg=release-zlib
+vc-x64-zlib: $(VC)
+ cd lib
+ nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-zlib
+ cd ..\src
+ nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-zlib
+
vc-ssl: $(VC)
cd lib
nmake /f Makefile.$(VC) cfg=release-ssl
cd ..\src
nmake /f Makefile.$(VC) cfg=release-ssl
+vc-winssl: $(VC)
+ cd lib
+ nmake /f Makefile.$(VC) cfg=release-winssl WINDOWS_SSPI=1
+ cd ..\src
+ nmake /f Makefile.$(VC) cfg=release-winssl WINDOWS_SSPI=1
+
+vc-x64-ssl: $(VC)
+ cd lib
+ nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-ssl
+ cd ..\src
+ nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-ssl
+
+vc-x64-winssl: $(VC)
+ cd lib
+ nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-winssl WINDOWS_SSPI=1
+ cd ..\src
+ nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-winssl WINDOWS_SSPI=1
+
vc-ssl-zlib: $(VC)
cd lib
nmake /f Makefile.$(VC) cfg=release-ssl-zlib
diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index 8b92a6caa..f2d441822 100644
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -166,6 +166,18 @@ CFGSET = TRUE
!ENDIF
######################
+# release-winssl
+
+!IF "$(CFG)" == "release-winssl"
+TARGET = $(LIBCURL_STA_LIB_REL)
+DIROBJ = $(CFG)
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
+LNK = $(LNKLIB) /out:$(DIROBJ)\$(TARGET)
+CC = $(CCNODBG) $(RTLIB) $(CFLAGSWINSSL) $(CFLAGSLIB)
+CFGSET = TRUE
+!ENDIF
+
+######################
# release-zlib
!IF "$(CFG)" == "release-zlib"