more mingw related cleanups.

[openssl.git] / ms / mingw32.bat

diff --git a/ms/mingw32.bat b/ms/mingw32.bat
index 87294d06f50c61af4196d877eda79bfe81c9ac3f..8c7c63e0f265894a3cfefe62d3b2a5f4b614de49 100644 (file)
--- a/ms/mingw32.bat
+++ b/ms/mingw32.bat
@@ -1,14 +1,19 @@
 @rem OpenSSL with Mingw32+GNU as\r
 @rem ---------------------------\r
 \r
-perl Configure Mingw32 %1 %2 %3 %4 %5 %6 %7 %8\r
+perl Configure mingw %1 %2 %3 %4 %5 %6 %7 %8\r
 \r
 @echo off\r
+\r
+perl -e "exit 1 if '%1' eq 'no-asm'"\r
+if errorlevel 1 goto noasm\r
+\r
 echo Generating x86 for GNU assember\r
 \r
 echo Bignum\r
 cd crypto\bn\asm\r
-perl x86.pl gaswin > bn-win32.s\r
+perl bn-586.pl gaswin > bn-win32.s\r
+perl co-586.pl gaswin > co-win32.s\r
 cd ..\..\..\r
 \r
 echo DES\r
@@ -56,25 +61,24 @@ cd crypto\rc5\asm
 perl rc5-586.pl gaswin > r5-win32.s\r
 cd ..\..\..\r
 \r
-@rem Makefile\r
+:noasm\r
+\r
+echo Generating makefile\r
 perl util\mkfiles.pl >MINFO\r
 perl util\mk1mf.pl gaswin Mingw32 >ms\mingw32a.mak\r
-perl util\mk1mf.pl gaswin Mingw32-files >ms\mingw32f.mak\r
-@rem DLL definition files\r
+echo Generating DLL definition files\r
 perl util\mkdef.pl 32 libeay >ms\libeay32.def\r
 if errorlevel 1 goto end\r
 perl util\mkdef.pl 32 ssleay >ms\ssleay32.def\r
 if errorlevel 1 goto end\r
 \r
-@rem Create files -- this can be skipped if using the GNU file utilities\r
-make -f ms/mingw32f.mak\r
-echo You can ignore the error messages above\r
+rem copy ms\tlhelp32.h outinc\r
 \r
-@rem Build the libraries\r
-make -f ms/mingw32a.mak\r
+echo Building the libraries\r
+mingw32-make -f ms/mingw32a.mak\r
 if errorlevel 1 goto end\r
 \r
-@rem Generate the DLLs and input libraries\r
+echo Generating the DLLs and input libraries\r
 dllwrap --dllname libeay32.dll --output-lib out/libeay32.a --def ms/libeay32.def out/libcrypto.a -lwsock32 -lgdi32\r
 if errorlevel 1 goto end\r
 dllwrap --dllname libssl32.dll --output-lib out/libssl32.a --def ms/ssleay32.def out/libssl.a out/libeay32.a\r