diff options
author | marha <marha@users.sourceforge.net> | 2010-03-30 12:36:28 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-03-30 12:36:28 +0000 |
commit | ff48c0d9098080b51ea12710029135916d117806 (patch) | |
tree | 96e6af9caf170ba21a1027b24e306a07e27d7b75 /openssl/ms/mingw32.bat | |
parent | bb731f5ac92655c4860a41fa818a7a63005f8369 (diff) | |
download | vcxsrv-ff48c0d9098080b51ea12710029135916d117806.tar.gz vcxsrv-ff48c0d9098080b51ea12710029135916d117806.tar.bz2 vcxsrv-ff48c0d9098080b51ea12710029135916d117806.zip |
svn merge -r514:HEAD ^/branches/released .
Diffstat (limited to 'openssl/ms/mingw32.bat')
-rw-r--r-- | openssl/ms/mingw32.bat | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/openssl/ms/mingw32.bat b/openssl/ms/mingw32.bat index f9377a869..06b573387 100644 --- a/openssl/ms/mingw32.bat +++ b/openssl/ms/mingw32.bat @@ -60,10 +60,6 @@ echo RC5\32 cd crypto\rc5\asm perl rc5-586.pl gaswin > r5-win32.s cd ..\..\.. -echo CPUID -cd crypto -perl x86cpuid.pl gaswin > cpu-win32.s -cd .. :noasm @@ -83,7 +79,7 @@ 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 -lwsock32 -lgdi32 +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 |