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 cd9dbd45a97515a86c7ea62f47449c09793bde48..676275df67d625df039ee08f0712b238bef78704 100644 (file)
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -155,7 +155,6 @@ if ($FLAVOR =~ /CE/)
 else
        {
        $ex_libs.=' gdi32.lib advapi32.lib crypt32.lib user32.lib';
-       $ex_libs.=' cryptui.lib' if $cflags =~ /-DOPENSSL_CAPIENG_DIALOG/;
        $ex_libs.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
        # WIN32 UNICODE build gets linked with unicows.lib for
        # backward compatibility with Win9x.
@@ -163,7 +162,7 @@ else
        }
 
 # static library stuff
-$mklib='lib';
+$mklib='lib /nologo';
 $ranlib='';
 $plib="";
 $libp=".lib";
@@ -174,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 {
@@ -194,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";
@@ -295,10 +294,6 @@ sub do_lib_rule
                        if ($target =~ /capi/)
                                {
                                $ex.=' crypt32.lib advapi32.lib';
-                               if ($cflags =~ /-DOPENSSL_CAPIENG_DIALOG/)
-                                       {
-                                       $ex.=' cryptui.lib';
-                                       }
                                }
                        }
                elsif ($FLAVOR =~ /CE/)