X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=ms%2Fdo_win64a.bat;h=8768dc61be20529dbb1d4f629974c51a7121f98e;hb=8caab744f5698ed2b55eca20f032540f713327fd;hp=825c690221506be3d5c04b56671217287fe9c22e;hpb=1875e6db29fb832d3cac101024ccb1f690b35028;p=openssl.git

diff --git a/ms/do_win64a.bat b/ms/do_win64a.bat
index 825c690221..8768dc61be 100755
--- a/ms/do_win64a.bat
+++ b/ms/do_win64a.bat
@@ -1,9 +1,19 @@
-
-perl util\mkfiles.pl >MINFO
-perl ms\uplink.pl win64a > ms\uptable.asm
-ml64 -c -Foms\uptable.obj ms\uptable.asm
-perl util\mk1mf.pl no-asm VC-WIN64A >ms\nt.mak
-perl util\mk1mf.pl dll no-asm VC-WIN64A >ms\ntdll.mak
-
-perl util\mkdef.pl 32 libeay > ms\libeay32.def
-perl util\mkdef.pl 32 ssleay > ms\ssleay32.def
+perl util\mkfiles.pl >MINFO
+
+cmd /c "nasm -f win64 -v" >NUL 2>&1
+if %errorlevel% neq 0 goto ml64
+
+perl ms\uplink-x86_64.pl nasm > ms\uptable.asm
+nasm -f win64 -o ms\uptable.obj ms\uptable.asm
+goto proceed
+
+:ml64
+perl ms\uplink-x86_64.pl masm > ms\uptable.asm
+ml64 -c -Foms\uptable.obj ms\uptable.asm
+
+:proceed
+perl util\mk1mf.pl VC-WIN64A >ms\nt.mak
+perl util\mk1mf.pl dll VC-WIN64A >ms\ntdll.mak
+
+perl util\mkdef.pl 32 libeay > ms\libeay32.def
+perl util\mkdef.pl 32 ssleay > ms\ssleay32.def