Switch Win32/64 targets to Winsock2. Updates to ISNTALL.W32 cover even

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

diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index ea606109e604d751ad50b23cbcbeecae9368cf77..1140cfb0c5d36fbe23caa732c138a1c53ccca24c 100644 (file)
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -11,6 +11,8 @@ $cp='$(PERL) util/copy.pl';
 $mkdir='$(PERL) util/mkdir-p.pl';
 $rm='del';
 
+$zlib_lib="zlib1.lib";
+
 # C compiler stuff
 $cc='cl';
 if ($FLAVOR =~ /WIN64/)
@@ -27,7 +29,8 @@ if ($FLAVOR =~ /WIN64/)
     # considered safe to ignore.
     # 
     $base_cflags=' /W3 /Gs0 /GF /Gy /nologo -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DOPENSSL_SYSNAME_WIN32 -DOPENSSL_SYSNAME_WINNT -DUNICODE -D_UNICODE';
-    $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8
+    $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE';       # shut up VC8
+    $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE';      # shut up VC8
     $opt_cflags=' /MD /Ox';
     $dbg_cflags=' /MDd /Od -DDEBUG -D_DEBUG';
     $lflags="/nologo /subsystem:console /opt:ref";
@@ -92,9 +95,10 @@ else # Win32
     {
     $base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
     $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE';       # shut up VC8
+    $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE';      # shut up VC8
     $opt_cflags=' /MD /Ox /O2 /Ob2';
     $dbg_cflags=' /MDd /Od -DDEBUG -D_DEBUG';
-    $lflags="/nologo /subsystem:console /machine:I386 /opt:ref";
+    $lflags="/nologo /subsystem:console /opt:ref";
     }
 $mlflags='';
 
@@ -123,7 +127,7 @@ $efile="/out:";
 $exep='.exe';
 if ($no_sock)          { $ex_libs=''; }
 elsif ($FLAVOR =~ /CE/)        { $ex_libs='winsock.lib'; }
-else                   { $ex_libs='wsock32.lib'; }
+else                   { $ex_libs='ws2_32.lib'; }
 
 if ($FLAVOR =~ /CE/)
        {
@@ -144,7 +148,6 @@ if ($FLAVOR =~ /NT/)
        $cflags.=" -DOPENSSL_SYSNAME_WINNT -DUNICODE -D_UNICODE";
        $ex_libs="unicows.lib $ex_libs";
        }
-
 # static library stuff
 $mklib='lib';
 $ranlib='';
@@ -191,7 +194,11 @@ if (!$no_asm)
        $sha1_asm_src='crypto\sha\asm\s1_win32.asm';
        $rmd160_asm_obj='crypto\ripemd\asm\rm_win32.obj';
        $rmd160_asm_src='crypto\ripemd\asm\rm_win32.asm';
-       $cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM -DRMD160_ASM";
+       $whirlpool_asm_obj='crypto\whrlpool\asm\wp_win32.obj';
+       $whirlpool_asm_src='crypto\whrlpool\asm\wp_win32.asm';
+       $cpuid_asm_obj='crypto\cpu_win32.obj';
+       $cpuid_asm_src='crypto\cpu_win32.asm';
+       $cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM -DRMD160_ASM -DWHIRLPOOL_ASM";
        }
 
 if ($shlib && $FLAVOR !~ /CE/)
@@ -273,10 +280,12 @@ sub do_lib_rule
                else
                        {
                        $ex.=' unicows.lib' if ($FLAVOR =~ /NT/);
-                       $ex.=' wsock32.lib gdi32.lib advapi32.lib user32.lib';
+                       $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 -manifest \$@.manifest -outputresource:\$@;2\n\n";
                }
        $ret.="\n";
        return($ret);
@@ -290,8 +299,9 @@ sub do_link_rule
        $file =~ s/\//$o/g if $o ne '/';
        $n=&bname($targer);
        $ret.="$target: $files $dep_libs\n";
-       $ret.="  \$(LINK) \$(LFLAGS) $efile$target @<<\n";
-       $ret.="  \$(APP_EX_OBJ) $files $libs\n<<\n\n";
+       $ret.="\t\$(LINK) \$(LFLAGS) $efile$target @<<\n";
+       $ret.="  \$(APP_EX_OBJ) $files $libs\n<<\n";
+    $ret.="\tIF EXIST \$@.manifest mt -manifest \$@.manifest -outputresource:\$@;1\n\n";
        return($ret);
        }