Rename asc2uni and uni2asc functions to avoid clashes.

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

diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index 57da5901b6ef8d419b45d5cec3fb188ae6c77026..676275df67d625df039ee08f0712b238bef78704 100644 (file)
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -162,7 +162,7 @@ else
        }
 
 # static library stuff
-$mklib='lib';
+$mklib='lib /nologo';
 $ranlib='';
 $plib="";
 $libp=".lib";
@@ -173,7 +173,7 @@ $shlib_ex_obj="";
 $app_ex_obj="setargv.obj" if ($FLAVOR !~ /CE/);
 if ($FLAVOR =~ /WIN64A/) {
        if (`nasm -v` =~ /NASM version ([0-9]+\.[0-9]+)/ && $1 >= 2.0) {
-               $asm='nasm -f win64';
+               $asm='nasm -f win64 -DNEAR -Ox';
                $asm.=' -g' if $debug;
                $afile='-o ';
        } else {
@@ -193,7 +193,7 @@ if ($FLAVOR =~ /WIN64A/) {
        $asmtype="win32n";
        $afile='-o ';
 } else {
-       $asm='ml /Cp /coff /c /Cx';
+       $asm='ml /nologo /Cp /coff /c /Cx';
        $asm.=" /Zi" if $debug;
        $afile='/Fo';
        $asmtype="win32";
@@ -291,7 +291,10 @@ sub do_lib_rule
                if ($name eq "")
                        {
                        $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
-                       $ex.=' crypt32.lib advapi32.lib' if ($target =~ /capi/);
+                       if ($target =~ /capi/)
+                               {
+                               $ex.=' crypt32.lib advapi32.lib';
+                               }
                        }
                elsif ($FLAVOR =~ /CE/)
                        {
@@ -303,6 +306,8 @@ sub do_lib_rule
                        {
                        $ex.=' unicows.lib' if ($FLAVOR =~ /NT/);
                        $ex.=' ws2_32.lib gdi32.lib advapi32.lib user32.lib';
+                       $ex.=' crypt32.lib';
+                       $ex.=' cryptui.lib' if $cflags =~ /-DOPENSSL_CAPIENG_DIALOG/;
                        $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
                        }
                $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/;