evp/e_aes_cbc_hmac_sha256.c: give SHAEXT right priority.

[oweals/openssl.git] / util / pl / Mingw32.pl

diff --git a/util/pl/Mingw32.pl b/util/pl/Mingw32.pl
index 043a3a53ee29dbda2ca5bb2048073a1dad302fe7..55c85f6447142d90354dc648077776558f728de1 100644 (file)
--- a/util/pl/Mingw32.pl
+++ b/util/pl/Mingw32.pl
@@ -43,7 +43,7 @@ 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';
-       $cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM";
+       $cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM -DOPENSSL_BN_ASM_PART_WORDS";
        }
 
 
@@ -55,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';
@@ -85,7 +85,7 @@ sub do_lib_rule
        ($Name=$name) =~ tr/a-z/A-Z/;
 
        $ret.="$target: \$(${Name}OBJ)\n";
-       $ret.="\t\$(RM) $target\n";
+       $ret.="\tif exist $target \$(RM) $target\n";
        $ret.="\t\$(MKLIB) $target \$(${Name}OBJ)\n";
        $ret.="\t\$(RANLIB) $target\n\n";
        }
@@ -98,7 +98,7 @@ sub do_link_rule
        $file =~ s/\//$o/g if $o ne '/';
        $n=&bname($target);
        $ret.="$target: $files $dep_libs\n";
-       $ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n\n";
+       $ret.="\t\$(LINK_CMD) ${efile}$target \$(LFLAGS) $files $libs\n\n";
        return($ret);
        }
 1;