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/util/pl/Mingw32.pl | |
| 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/util/pl/Mingw32.pl')
| -rw-r--r-- | openssl/util/pl/Mingw32.pl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/openssl/util/pl/Mingw32.pl b/openssl/util/pl/Mingw32.pl index 8f0483fb9..fe3fb27a7 100644 --- a/openssl/util/pl/Mingw32.pl +++ b/openssl/util/pl/Mingw32.pl @@ -19,7 +19,7 @@ $cc='gcc'; if ($debug) { $cflags="-DL_ENDIAN -DDSO_WIN32 -g2 -ggdb"; } else - { $cflags="-DL_ENDIAN -DDSO_WIN32 -fomit-frame-pointer -O3 -march=i486 -Wall"; } + { $cflags="-DL_ENDIAN -DDSO_WIN32 -fomit-frame-pointer -O3 -mcpu=i486 -Wall"; } if ($gaswin and !$no_asm) { @@ -43,8 +43,6 @@ if ($gaswin and !$no_asm) $rmd160_asm_src='crypto/ripemd/asm/rm-win32.s'; $sha1_asm_obj='$(OBJ_D)\s1-win32.o'; $sha1_asm_src='crypto/sha/asm/s1-win32.s'; - $cpuid_asm_obj='$(OBJ_D)\cpu-win32.o'; - $cpuid_asm_src='crypto/cpu-win32.s'; $cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM -DOPENSSL_BN_ASM_PART_WORDS"; } @@ -57,7 +55,7 @@ $link='${CC}'; $lflags='${CFLAGS}'; $efile='-o '; $exep=''; -$ex_libs="-lwsock32 -lgdi32"; +$ex_libs="-lws2_32 -lgdi32"; # static library stuff $mklib='ar r'; |