diff options
| author | Andy Polyakov <appro@openssl.org> | 2011-11-14 21:12:05 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2011-11-14 21:12:05 +0000 |
| commit | 886657a6411e19a8824828761a3d395243d4e0ef (patch) | |
| tree | a0fc814c924b5de686bbbcb68dc5ede67a1352fc /ms | |
| parent | db896db5a75f30ed5b46c89ba1d4272cbc145d6b (diff) | |
Configure, etc.: engage additional assembler modules.
Diffstat (limited to 'ms')
| -rwxr-xr-x | ms/do_win64a.bat | 18 | ||||
| -rwxr-xr-x | ms/do_win64i.bat | 6 |
2 files changed, 17 insertions, 7 deletions
diff --git a/ms/do_win64a.bat b/ms/do_win64a.bat index 495f1ea7d8..ff8b19ccfd 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 + +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 -perl util\mk1mf.pl no-asm VC-WIN64A >ms\nt.mak -perl util\mk1mf.pl dll no-asm VC-WIN64A >ms\ntdll.mak + +: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 diff --git a/ms/do_win64i.bat b/ms/do_win64i.bat index 15ebcaaeb6..088f5e1d0a 100755 --- a/ms/do_win64i.bat +++ b/ms/do_win64i.bat @@ -1,9 +1,9 @@ perl util\mkfiles.pl >MINFO -perl ms\uplink.pl win64i > ms\uptable.asm +perl ms\uplink-ia64.pl > ms\uptable.asm ias -o ms\uptable.obj ms\uptable.asm -perl util\mk1mf.pl no-asm VC-WIN64I >ms\nt.mak -perl util\mk1mf.pl dll no-asm VC-WIN64I >ms\ntdll.mak +perl util\mk1mf.pl VC-WIN64I >ms\nt.mak +perl util\mk1mf.pl dll VC-WIN64I >ms\ntdll.mak perl util\mkdef.pl 32 libeay > ms\libeay32.def perl util\mkdef.pl 32 ssleay > ms\ssleay32.def |