1 files changed, 24 insertions, 17 deletions

diff --git a/src/lib/libcrypto/util/pl/VC-32.pl b/src/lib/libcrypto/util/pl/VC-32.pl
index 701e282c33..50bfb34385 100644
--- a/src/lib/libcrypto/util/pl/VC-32.pl
+++ b/src/lib/libcrypto/util/pl/VC-32.pl
@@ -1,18 +1,17 @@
-#!/usr/bin/perl
+#!/usr/local/bin/perl
 # VCw32lib.pl - the file for Visual C++ 4.[01] for windows NT, static libraries
 #
 
 $ssl=   "ssleay32";
 $crypto="libeay32";
-$RSAref="RSAref32";
 
 $o='\\';
-$cp='copy';
+$cp='copy nul+';        # Timestamps get stuffed otherwise
 $rm='del';
 
 # C compiler stuff
 $cc='cl';
-$cflags=' /MD /W3 /WX /G5 /Ox /O2 /Ob2 /Gs0 /GF /Gy /nologo -DWIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN';
+$cflags=' /MD /W3 /WX /G5 /Ox /O2 /Ob2 /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
 $lflags="/nologo /subsystem:console /machine:I386 /opt:ref";
 $mlflags='';
 
@@ -22,10 +21,11 @@ $inc_def="inc32";
 
 if ($debug)
         {
-        $cflags=" /MDd /W3 /WX /Zi /Yd /Od /nologo -DWINDOWS -DWIN32 -D_DEBUG -DL_ENDIAN";
+        $cflags=" /MDd /W3 /WX /Zi /Yd /Od /nologo -DOPENSSL_SYSNAME_WIN32 -D_DEBUG -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DDEBUG -DDSO_WIN32";
         $lflags.=" /debug";
         $mlflags.=' /debug';
         }
+$cflags .= " -DOPENSSL_SYSNAME_WINNT" if $NT == 1;
 
 $obj='.obj';
 $ofile="/Fo";
@@ -48,13 +48,17 @@ $lfile='/out:';
 
 $shlib_ex_obj="";
 $app_ex_obj="setargv.obj";
-
-$asm='ml /Cp /coff /c /Cx';
-$asm.=" /Zi" if $debug;
-$afile='/Fo';
-
-$bn_mulw_obj='';
-$bn_mulw_src='';
+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='';
 $des_enc_obj='';
 $des_enc_src='';
 $bf_enc_obj='';
@@ -62,8 +66,8 @@ $bf_enc_src='';
 
 if (!$no_asm)
         {
-        $bn_mulw_obj='crypto\bn\asm\bn-win32.obj';
-        $bn_mulw_src='crypto\bn\asm\bn-win32.asm';
+        $bn_asm_obj='crypto\bn\asm\bn-win32.obj';
+        $bn_asm_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';
@@ -87,11 +91,13 @@ if ($shlib)
         {
         $mlflags.=" $lflags /dll";
 #       $cflags =~ s| /MD| /MT|;
-        $lib_cflag=" /GD -D_WINDLL -D_DLL";
+        $lib_cflag=" -D_WINDLL -D_DLL";
         $out_def="out32dll";
         $tmp_def="tmp32dll";
         }
 
+$cflags.=" /Fd$out_def";
+
 sub do_lib_rule
         {
         local($objs,$target,$name,$shlib)=@_;
@@ -105,12 +111,13 @@ sub do_lib_rule
         if (!$shlib)
                 {
 #               $ret.="\t\$(RM) \$(O_$Name)\n";
-                $ret.="\t\$(MKLIB) $lfile$target @<<\n  $objs\n<<\n";
+                $ex =' advapi32.lib';
+                $ret.="\t\$(MKLIB) $lfile$target @<<\n  $objs $ex\n<<\n";
                 }
         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";