Update from 1.0.0-stable

[openssl.git] / ms / mingw32.bat

diff --git a/ms/mingw32.bat b/ms/mingw32.bat
index 1726c55bcdaefc66e723ff09995ddba709cdba3c..7c26983035b252f5711e6dd747eeeff5da931a90 100644 (file)
--- a/ms/mingw32.bat
+++ b/ms/mingw32.bat
@@ -1,7 +1,7 @@
 @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
@@ -12,7 +12,8 @@ echo Generating x86 for GNU assember
 \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
@@ -65,23 +66,20 @@ cd ..\..\..
 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
 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
 echo Building the libraries\r
-make -f ms/mingw32a.mak\r
+mingw32-make -f ms/mingw32a.mak\r
 if errorlevel 1 goto end\r
 \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
+dllwrap --dllname libeay32.dll --output-lib out/libeay32.a --def ms/libeay32.def out/libcrypto.a -lws2_32 -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
 if errorlevel 1 goto end\r