Commit 45e093fc authored by Yang Tse's avatar Yang Tse
Browse files

Fix vc-x64 target having MACHINE= wrongly positioned, and added vc-x64-ssl-zlib 

target as indicated end requested by Viktor Szakats in bug report #2872879.
parent e593715d

Makefile.dist

+8 −2
Original line number Diff line number Diff line
@@ -130,9 +130,9 @@ vc: 


vc-x64:

	cd lib

	MACHINE=x64 nmake /f Makefile.$(VC) cfg=release

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release

	cd ..\src

	MACHINE=x64 nmake /f Makefile.$(VC)

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release



vc-zlib:

	cd lib
@@ -152,6 +152,12 @@ vc-ssl-zlib: 
	cd ..\src

	nmake /f Makefile.$(VC) cfg=release-ssl-zlib



vc-x64-ssl-zlib:

	cd lib

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-ssl-zlib

	cd ..\src

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-ssl-zlib



vc-ssl-dll:

	cd lib

	nmake /f Makefile.$(VC) cfg=release-ssl-dll