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.

diff --git a/Makefile.dist b/Makefile.dist
index 565918dbc9f91897778aced10d011ae7c2655fa3..48d30615296581c8c6198e7905f87d73689a9e4d 100644 (file)
--- a/Makefile.dist
+++ b/Makefile.dist
@@ -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