VC-32.pl: fix /Fd name generation.

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

diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index d873c721d22518ec5208343dddf0bc85a540487e..61a16bb09bcf429e944af7c136f1cb2265b9719c 100644 (file)
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -13,6 +13,10 @@ $rm='del /Q';
 
 $zlib_lib="zlib1.lib";
 
+# Santize -L options for ms link
+$l_flags =~ s/-L("\[^"]+")/\/libpath:$1/g;
+$l_flags =~ s/-L(\S+)/\/libpath:$1/g;
+
 # C compiler stuff
 $cc='cl';
 if ($FLAVOR =~ /WIN64/)
@@ -42,6 +46,7 @@ if ($FLAVOR =~ /WIN64/)
        $bname =~ s/(.*)\.[^\.]$/$1/;
        $ret=<<___;
 \$(TMP_D)$o$bname.asm: $source
+       set ASM=\$(ASM)
        \$(PERL) $source \$\@
 
 $target: \$(TMP_D)$o$bname.asm
@@ -117,21 +122,26 @@ else      # Win32
     }
 $mlflags='';
 
-$out_def="out32"; $out_def.='_$(TARGETCPU)' if ($FLAVOR =~ /CE/);
-$tmp_def="tmp32"; $tmp_def.='_$(TARGETCPU)' if ($FLAVOR =~ /CE/);
+$out_def ="out32";     $out_def.="dll"                 if ($shlib);
+                       $out_def.='_$(TARGETCPU)'       if ($FLAVOR =~ /CE/);
+$tmp_def ="tmp32";     $tmp_def.="dll"                 if ($shlib);
+                       $tmp_def.='_$(TARGETCPU)'       if ($FLAVOR =~ /CE/);
 $inc_def="inc32";
 
 if ($debug)
        {
        $cflags=$dbg_cflags.$base_cflags;
-       $lflags.=" /debug";
-       $mlflags.=' /debug';
        }
 else
        {
        $cflags=$opt_cflags.$base_cflags;
        }
 
+# generate symbols.pdb unconditionally
+$app_cflag.=" /Zi /Fd\$(TMP_D)/app";
+$lib_cflag.=" /Zi /Fd\$(TMP_D)/lib";
+$lflags.=" /debug";
+
 $obj='.obj';
 $asm_suffix='.asm';
 $ofile="/Fo";
@@ -153,15 +163,15 @@ if ($FLAVOR =~ /CE/)
        }
 else
        {
-       $ex_libs.=' gdi32.lib advapi32.lib user32.lib';
-       $ex_libs.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
+       $ex_libs.=' gdi32.lib advapi32.lib crypt32.lib user32.lib';
+       $ex_libs.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/ and `cl 2>&1` =~ /14\.00\.4[0-9]{4}\./);
        # WIN32 UNICODE build gets linked with unicows.lib for
        # backward compatibility with Win9x.
        $ex_libs="unicows.lib $ex_libs" if ($FLAVOR =~ /WIN32/ and $cflags =~ /\-DUNICODE/);
        }
 
 # static library stuff
-$mklib='lib';
+$mklib='lib /nologo';
 $ranlib='';
 $plib="";
 $libp=".lib";
@@ -171,12 +181,15 @@ $lfile='/out:';
 $shlib_ex_obj="";
 $app_ex_obj="setargv.obj" if ($FLAVOR !~ /CE/);
 if ($FLAVOR =~ /WIN64A/) {
-       $asm='ml64 /c /Cp /Cx';
-       $asm.=" /Zi" if $debug;
-       $afile='/Fo';
+       if (`nasm -v 2>NUL` =~ /NASM version ([0-9]+\.[0-9]+)/ && $1 >= 2.0) {
+               $asm='nasm -f win64 -DNEAR -Ox -g';
+               $afile='-o ';
+       } else {
+               $asm='ml64 /c /Cp /Cx /Zi';
+               $afile='/Fo';
+       }
 } elsif ($FLAVOR =~ /WIN64I/) {
-       $asm='ias';
-       $asm.=" -d debug" if $debug;
+       $asm='ias -d debug';
        $afile="-o ";
 } elsif ($nasm) {
        my $ver=`nasm -v 2>NUL`;
@@ -186,8 +199,7 @@ if ($FLAVOR =~ /WIN64A/) {
        $asmtype="win32n";
        $afile='-o ';
 } else {
-       $asm='ml /Cp /coff /c /Cx';
-       $asm.=" /Zi" if $debug;
+       $asm='ml /nologo /Cp /coff /c /Cx /Zi';
        $afile='/Fo';
        $asmtype="win32";
 }
@@ -219,9 +231,7 @@ if (!$no_asm)
 if ($shlib && $FLAVOR !~ /CE/)
        {
        $mlflags.=" $lflags /dll";
-       $lib_cflag=" -D_WINDLL";
-       $out_def="out32dll";
-       $tmp_def="tmp32dll";
+       $lib_cflag.=" -D_WINDLL";
        #
        # Engage Applink...
        #
@@ -251,13 +261,9 @@ elsif ($shlib && $FLAVOR =~ /CE/)
        {
        $mlflags.=" $lflags /dll";
        $lflags.=' /entry:mainCRTstartup' if(defined($ENV{'PORTSDK_LIBPATH'}));
-       $lib_cflag=" -D_WINDLL -D_DLL";
-       $out_def='out32dll_$(TARGETCPU)';
-       $tmp_def='tmp32dll_$(TARGETCPU)';
+       $lib_cflag.=" -D_WINDLL -D_DLL";
        }
 
-$cflags.=" /Fd$out_def";
-
 sub do_lib_rule
        {
        local($objs,$target,$name,$shlib)=@_;
@@ -275,31 +281,14 @@ sub do_lib_rule
        if (!$shlib)
                {
 #              $ret.="\t\$(RM) \$(O_$Name)\n";
-               $ex =' ';
-               $ret.="\t\$(MKLIB) $lfile$target @<<\n  $objs $ex\n<<\n";
+               $ret.="\t\$(MKLIB) $lfile$target @<<\n  $objs\n<<\n";
                }
        else
                {
                local($ex)=($target =~ /O_CRYPTO/)?'':' $(L_CRYPTO)';
-               if ($name eq "")
-                       {
-                       $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
-                       }
-               elsif ($FLAVOR =~ /CE/)
-                       {
-                       $ex.=' winsock.lib';
-                       $ex.=' $(WCECOMPAT)/lib/wcecompatex.lib' if (defined($ENV{'WCECOMPAT'}));
-                       $ex.=' $(PORTSDK_LIBPATH)/portlib.lib'   if (defined($ENV{'PORTSDK_LIBPATH'}));
-                       }
-               else
-                       {
-                       $ex.=' unicows.lib' if ($FLAVOR =~ /NT/);
-                       $ex.=' ws2_32.lib gdi32.lib advapi32.lib user32.lib';
-                       $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
-                       }
                $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/;
-               $ret.="\t\$(LINK) \$(MLFLAGS) $efile$target $name @<<\n  \$(SHLIB_EX_OBJ) $objs $ex\n<<\n";
-        $ret.="\tIF EXIST \$@.manifest mt -nologo -manifest \$@.manifest -outputresource:\$@;2\n\n";
+               $ret.="\t\$(LINK) \$(MLFLAGS) $efile$target $name @<<\n  \$(SHLIB_EX_OBJ) $objs $ex \$(EX_LIBS)\n<<\n";
+               $ret.="\tIF EXIST \$@.manifest mt -nologo -manifest \$@.manifest -outputresource:\$@;2\n\n";
                }
        $ret.="\n";
        return($ret);
@@ -315,7 +304,7 @@ sub do_link_rule
        $ret.="$target: $files $dep_libs\n";
        $ret.="\t\$(LINK) \$(LFLAGS) $efile$target @<<\n";
        $ret.="  \$(APP_EX_OBJ) $files $libs\n<<\n";
-    $ret.="\tIF EXIST \$@.manifest mt -nologo -manifest \$@.manifest -outputresource:\$@;1\n\n";
+       $ret.="\tIF EXIST \$@.manifest mt -nologo -manifest \$@.manifest -outputresource:\$@;1\n\n";
        return($ret);
        }