A few changes to BC-32.pl didn't get properly applied.

[openssl.git] / util / pl / BC-32.pl

diff --git a/util/pl/BC-32.pl b/util/pl/BC-32.pl
index 7305c9566641c466b60431299d345128a0c95d11..bd7a9d930140a66c93b19ae2988ef348dad3e13b 100644 (file)
--- a/util/pl/BC-32.pl
+++ b/util/pl/BC-32.pl
@@ -4,7 +4,6 @@
 
 $ssl=  "ssleay32";
 $crypto="libeay32";
-$RSAref="RSAref32";
 
 $o='\\';
 $cp='copy';
@@ -18,9 +17,8 @@ $mlflags='';
 $out_def="out32";
 $tmp_def="tmp32";
 $inc_def="inc32";
-#enable max error messages, disable most common errors, and be quiet
-$cflags="-j255 -w-aus -w-par -w-inl  -c -tWC -tWM -DWINDOWS -DWIN32 -DL_ENDIAN ";
-$dcflags='n'
+#enable max error messages, disable most common warnings
+$cflags="-DWIN32_LEAN_AND_MEAN -q -w-aus -w-par -w-inl  -c -tWC -tWM -DOPENSSL_SYSNAME_WIN32 -DL_ENDIAN -DDSO_WIN32 -D_stricmp=stricmp ";
 if ($debug)
 {
     $cflags.="-Od -y -v -vi- -D_DEBUG";
@@ -53,9 +51,9 @@ $lfile='';
 $shlib_ex_obj="";
 $app_ex_obj="c0x32.obj"; 
 
-$asm='n_o_T_a_s_m';
+$asm='nasmw';
 $asm.=" /Zi" if $debug;
-$afile='/Fo';
+$afile='-f obj -o';
 
 $bn_mulw_obj='';
 $bn_mulw_src='';
@@ -66,24 +64,24 @@ $bf_enc_src='';
 
 if (!$no_asm)
        {
-       $bn_mulw_obj='crypto\bn\asm\bn-win32.obj';
-       $bn_mulw_src='crypto\bn\asm\bn-win32.asm';
-       $des_enc_obj='crypto\des\asm\d-win32.obj crypto\des\asm\y-win32.obj';
-       $des_enc_src='crypto\des\asm\d-win32.asm crypto\des\asm\y-win32.asm';
-       $bf_enc_obj='crypto\bf\asm\b-win32.obj';
-       $bf_enc_src='crypto\bf\asm\b-win32.asm';
-       $cast_enc_obj='crypto\cast\asm\c-win32.obj';
-       $cast_enc_src='crypto\cast\asm\c-win32.asm';
-       $rc4_enc_obj='crypto\rc4\asm\r4-win32.obj';
-       $rc4_enc_src='crypto\rc4\asm\r4-win32.asm';
-       $rc5_enc_obj='crypto\rc5\asm\r5-win32.obj';
-       $rc5_enc_src='crypto\rc5\asm\r5-win32.asm';
-       $md5_asm_obj='crypto\md5\asm\m5-win32.obj';
-       $md5_asm_src='crypto\md5\asm\m5-win32.asm';
-       $sha1_asm_obj='crypto\sha\asm\s1-win32.obj';
-       $sha1_asm_src='crypto\sha\asm\s1-win32.asm';
-       $rmd160_asm_obj='crypto\ripemd\asm\rm-win32.obj';
-       $rmd160_asm_src='crypto\ripemd\asm\rm-win32.asm';
+       $bn_mulw_obj='crypto\bn\asm\bn_win32.obj';
+       $bn_mulw_src='crypto\bn\asm\bn_win32.asm';
+       $des_enc_obj='crypto\des\asm\d_win32.obj crypto\des\asm\y_win32.obj';
+       $des_enc_src='crypto\des\asm\d_win32.asm crypto\des\asm\y_win32.asm';
+       $bf_enc_obj='crypto\bf\asm\b_win32.obj';
+       $bf_enc_src='crypto\bf\asm\b_win32.asm';
+       $cast_enc_obj='crypto\cast\asm\c_win32.obj';
+       $cast_enc_src='crypto\cast\asm\c_win32.asm';
+       $rc4_enc_obj='crypto\rc4\asm\r4_win32.obj';
+       $rc4_enc_src='crypto\rc4\asm\r4_win32.asm';
+       $rc5_enc_obj='crypto\rc5\asm\r5_win32.obj';
+       $rc5_enc_src='crypto\rc5\asm\r5_win32.asm';
+       $md5_asm_obj='crypto\md5\asm\m5_win32.obj';
+       $md5_asm_src='crypto\md5\asm\m5_win32.asm';
+       $sha1_asm_obj='crypto\sha\asm\s1_win32.obj';
+       $sha1_asm_src='crypto\sha\asm\s1_win32.asm';
+       $rmd160_asm_obj='crypto\ripemd\asm\rm_win32.obj';
+       $rmd160_asm_src='crypto\ripemd\asm\rm_win32.asm';
        $cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM -DRMD160_ASM";
        }
 
@@ -110,7 +108,7 @@ sub do_lib_rule
                {
                #               $ret.="\t\$(RM) \$(O_$Name)\n";
                $ret.="\techo LIB $<\n";    
-               $ret.="\t\$(MKLIB) $lfile$target  \$(addprefix +, $objs)\n";
+                $ret.="\t&\$(MKLIB) $lfile$target -+\$**\n";
                }
        else
                {