diff options
| author | Andy Polyakov <appro@openssl.org> | 2010-07-26 23:58:23 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2010-07-26 23:58:23 +0200 |
| commit | 39438ff6e2d5a39ca5f260849e5f56844848b2c3 (patch) | |
| tree | 6c07eb073d1df298a5771e3486249115f9be39a4 /ms | |
| parent | sha1-alpha.pl: commentary update. (diff) | |
| download | openssl-39438ff6e2d5a39ca5f260849e5f56844848b2c3.tar.xz openssl-39438ff6e2d5a39ca5f260849e5f56844848b2c3.zip | |
ms/: update do_win64*.bat and remove redundant mingw32.bat.
Diffstat (limited to 'ms')
| -rwxr-xr-x | ms/do_win64a.bat | 4 | ||||
| -rwxr-xr-x | ms/do_win64i.bat | 4 | ||||
| -rw-r--r-- | ms/mingw32.bat | 90 |
3 files changed, 4 insertions, 94 deletions
diff --git a/ms/do_win64a.bat b/ms/do_win64a.bat index 42723f6a58..ff8b19ccfd 100755 --- a/ms/do_win64a.bat +++ b/ms/do_win64a.bat @@ -12,8 +12,8 @@ perl ms\uplink-x86_64.pl masm > ms\uptable.asm ml64 -c -Foms\uptable.obj ms\uptable.asm :proceed -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\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 1aa3d281ba..088f5e1d0a 100755 --- a/ms/do_win64i.bat +++ b/ms/do_win64i.bat @@ -2,8 +2,8 @@ perl util\mkfiles.pl >MINFO 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 diff --git a/ms/mingw32.bat b/ms/mingw32.bat deleted file mode 100644 index 06b5733878..0000000000 --- a/ms/mingw32.bat +++ /dev/null @@ -1,90 +0,0 @@ -@rem OpenSSL with Mingw32+GNU as -@rem --------------------------- - -perl Configure mingw %1 %2 %3 %4 %5 %6 %7 %8 - -@echo off - -perl -e "exit 1 if '%1' eq 'no-asm'" -if errorlevel 1 goto noasm - -echo Generating x86 for GNU assember - -echo Bignum -cd crypto\bn\asm -perl bn-586.pl gaswin > bn-win32.s -perl co-586.pl gaswin > co-win32.s -cd ..\..\.. - -echo DES -cd crypto\des\asm -perl des-586.pl gaswin > d-win32.s -cd ..\..\.. - -echo crypt -cd crypto\des\asm -perl crypt586.pl gaswin > y-win32.s -cd ..\..\.. - -echo Blowfish -cd crypto\bf\asm -perl bf-586.pl gaswin > b-win32.s -cd ..\..\.. - -echo CAST5 -cd crypto\cast\asm -perl cast-586.pl gaswin > c-win32.s -cd ..\..\.. - -echo RC4 -cd crypto\rc4\asm -perl rc4-586.pl gaswin > r4-win32.s -cd ..\..\.. - -echo MD5 -cd crypto\md5\asm -perl md5-586.pl gaswin > m5-win32.s -cd ..\..\.. - -echo SHA1 -cd crypto\sha\asm -perl sha1-586.pl gaswin > s1-win32.s -cd ..\..\.. - -echo RIPEMD160 -cd crypto\ripemd\asm -perl rmd-586.pl gaswin > rm-win32.s -cd ..\..\.. - -echo RC5\32 -cd crypto\rc5\asm -perl rc5-586.pl gaswin > r5-win32.s -cd ..\..\.. - -:noasm - -echo Generating makefile -perl util\mkfiles.pl >MINFO -perl util\mk1mf.pl gaswin Mingw32 >ms\mingw32a.mak -echo Generating DLL definition files -perl util\mkdef.pl 32 libeay >ms\libeay32.def -if errorlevel 1 goto end -perl util\mkdef.pl 32 ssleay >ms\ssleay32.def -if errorlevel 1 goto end - -rem copy ms\tlhelp32.h outinc - -echo Building the libraries -mingw32-make -f ms/mingw32a.mak -if errorlevel 1 goto end - -echo Generating the DLLs and input libraries -dllwrap --dllname libeay32.dll --output-lib out/libeay32.a --def ms/libeay32.def out/libcrypto.a -lws2_32 -lgdi32 -if errorlevel 1 goto end -dllwrap --dllname libssl32.dll --output-lib out/libssl32.a --def ms/ssleay32.def out/libssl.a out/libeay32.a -if errorlevel 1 goto end - -echo Done compiling OpenSSL - -:end - |