More NASM support code it still doesn't work but it doesn't work less than it

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

diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index c0d57937a8206d471d01f087b329811503dc4377..6db1c9fe23742480b3b90cf4d43a33239da88af5 100644 (file)
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -26,6 +26,7 @@ if ($debug)
        $lflags.=" /debug";
        $mlflags.=' /debug';
        }
+$cflags .= " -DWINNT" if $NT == 1;
 
 $obj='.obj';
 $ofile="/Fo";
@@ -48,10 +49,14 @@ $lfile='/out:';
 
 $shlib_ex_obj="";
 $app_ex_obj="setargv.obj";
-
-$asm='ml /Cp /coff /c /Cx';
-$asm.=" /Zi" if $debug;
-$afile='/Fo';
+if ($nasm) {
+       $asm='nasmw -f win32';
+       $afile='-o ';
+} else {
+       $asm='ml /Cp /coff /c /Cx';
+       $asm.=" /Zi" if $debug;
+       $afile='/Fo';
+}
 
 $bn_asm_obj='';
 $bn_asm_src='';
@@ -112,7 +117,7 @@ sub do_lib_rule
        else
                {
                local($ex)=($target =~ /O_SSL/)?' $(L_CRYPTO)':'';
-               $ex.=' wsock32.lib gdi32.lib';
+               $ex.=' wsock32.lib gdi32.lib advapi32.lib';
                $ret.="\t\$(LINK) \$(MLFLAGS) $efile$target /def:ms/${Name}.def @<<\n  \$(SHLIB_EX_OBJ) $objs $ex\n<<\n";
                }
        $ret.="\n";