Makefile: Added missing WinSSL and x64 configurations (fca7930d) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

Makefile.dist

+25 −1

Original line number	Diff line number	Diff line
		@@ -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

+12 −0

Original line number	Diff line number	Diff line
		@@ -165,6 +165,18 @@ CC = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSLIB)
		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