X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=ms%2Fmingw32.bat;h=8c7c63e0f265894a3cfefe62d3b2a5f4b614de49;hp=87294d06f50c61af4196d877eda79bfe81c9ac3f;hb=35295bdbeed634ebe811860831f25bc5ecc9d0bb;hpb=2da0c119260afd15433dde7c431c69c837ee840b

diff --git a/ms/mingw32.bat b/ms/mingw32.bat
index 87294d06f5..8c7c63e0f2 100644
--- a/ms/mingw32.bat
+++ b/ms/mingw32.bat
@@ -1,14 +1,19 @@
 @rem OpenSSL with Mingw32+GNU as
 @rem ---------------------------
 
-perl Configure Mingw32 %1 %2 %3 %4 %5 %6 %7 %8
+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 x86.pl gaswin > bn-win32.s
+perl bn-586.pl gaswin > bn-win32.s
+perl co-586.pl gaswin > co-win32.s
 cd ..\..\..
 
 echo DES
@@ -56,25 +61,24 @@ cd crypto\rc5\asm
 perl rc5-586.pl gaswin > r5-win32.s
 cd ..\..\..
 
-@rem Makefile
+:noasm
+
+echo Generating makefile
 perl util\mkfiles.pl >MINFO
 perl util\mk1mf.pl gaswin Mingw32 >ms\mingw32a.mak
-perl util\mk1mf.pl gaswin Mingw32-files >ms\mingw32f.mak
-@rem DLL definition files
+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 Create files -- this can be skipped if using the GNU file utilities
-make -f ms/mingw32f.mak
-echo You can ignore the error messages above
+rem copy ms\tlhelp32.h outinc
 
-@rem Build the libraries
-make -f ms/mingw32a.mak
+echo Building the libraries
+mingw32-make -f ms/mingw32a.mak
 if errorlevel 1 goto end
 
-@rem Generate the DLLs and input libraries
+echo Generating the DLLs and input libraries
 dllwrap --dllname libeay32.dll --output-lib out/libeay32.a --def ms/libeay32.def out/libcrypto.a -lwsock32 -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