Switch Win32/64 targets to Winsock2. Updates to ISNTALL.W32 cover even
[openssl.git] / util / pl / VC-32.pl
index 7aedfceedc38ccf708e84dbc3027b62c14ea93ed..1140cfb0c5d36fbe23caa732c138a1c53ccca24c 100644 (file)
@@ -7,9 +7,12 @@ $ssl=  "ssleay32";
 $crypto="libeay32";
 
 $o='\\';
-$cp='copy nul+';       # Timestamps get stuffed otherwise
+$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/)
@@ -26,6 +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_NONSTDC_NO_DEPRECATE';      # shut up VC8
     $opt_cflags=' /MD /Ox';
     $dbg_cflags=' /MDd /Od -DDEBUG -D_DEBUG';
     $lflags="/nologo /subsystem:console /opt:ref";
@@ -37,32 +42,63 @@ elsif ($FLAVOR =~ /CE/)
     die '%PLATFORM% is not defined'    if (!defined($ENV{'PLATFORM'}));
     die '%TARGETCPU% is not defined'   if (!defined($ENV{'TARGETCPU'}));
 
-    # pull CE version from OSVERSION environment variable
+    #
+    # Idea behind this is to mimic flags set by eVC++ IDE...
+    #
     $wcevers = $ENV{'OSVERSION'};                      # WCENNN
     die '%OSVERSION% value is insane'  if ($wcevers !~ /^WCE([1-9])([0-9]{2})$/);
-    $wcecdefs = "-D_WIN32_WCE=$1$2";           # -D_WIN32_WCE=NNN
-    $wcelflag = "/subsystem:windowsce,$1.$2";  # ...,N.NN
-    if ($ENV{'TARGETCPU'} =~ /^X86/)
-    {  $wcelflag .= " /machine:X86";                   }
-    else
-    {  $wcelflag .= " /machine:$ENV{'TARGETCPU'}";     }
+    $wcecdefs = "-D_WIN32_WCE=$1$2 -DUNDER_CE=$1$2";   # -D_WIN32_WCE=NNN
+    $wcelflag = "/subsystem:windowsce,$1.$2";          # ...,N.NN
+
     $wceplatf =  $ENV{'PLATFORM'};
     $wceplatf =~ tr/a-z0-9 /A-Z0-9_/d;
-    $wcecdefs .= " -DWCEPLATFORM=$wceplatf";
+    $wcecdefs .= " -DWCE_PLATFORM_$wceplatf";
+
+    $wcetgt = $ENV{'TARGETCPU'};       # just shorter name...
+    SWITCH: for($wcetgt) {
+       /^X86/          && do { $wcecdefs.=" -Dx86 -D_X86_ -D_i386_ -Di_386_";
+                               $wcelflag.=" /machine:IX86";    last; };
+       /^ARMV4[IT]/    && do { $wcecdefs.=" -DARM -D_ARM_ -D$wcetgt";
+                               $wcecdefs.=" -DTHUMB -D_THUMB_" if($wcetgt=~/T$/);
+                               $wcecdefs.=" -QRarch4T -QRinterwork-return";
+                               $wcelflag.=" /machine:THUMB";   last; };
+       /^ARM/          && do { $wcecdefs.=" -DARM -D_ARM_ -D$wcetgt";
+                               $wcelflag.=" /machine:ARM";     last; };
+       /^MIPSIV/       && do { $wcecdefs.=" -DMIPS -D_MIPS_ -DR4000 -D$wcetgt";
+                               $wcecdefs.=" -D_MIPS64 -QMmips4 -QMn32";
+                               $wcelflag.=" /machine:MIPSFPU"; last; };
+       /^MIPS16/       && do { $wcecdefs.=" -DMIPS -D_MIPS_ -DR4000 -D$wcetgt";
+                               $wcecdefs.=" -DMIPSII -QMmips16";
+                               $wcelflag.=" /machine:MIPS16";  last; };
+       /^MIPSII/       && do { $wcecdefs.=" -DMIPS -D_MIPS_ -DR4000 -D$wcetgt";
+                               $wcecdefs.=" -QMmips2";
+                               $wcelflag.=" /machine:MIPS";    last; };
+       /^R4[0-9]{3}/   && do { $wcecdefs.=" -DMIPS -D_MIPS_ -DR4000";
+                               $wcelflag.=" /machine:MIPS";    last; };
+       /^SH[0-9]/      && do { $wcecdefs.=" -D$wcetgt -D_$wcetgt_ -DSHx";
+                               $wcecdefs.=" -Qsh4" if ($wcetgt =~ /^SH4/);
+                               $wcelflag.=" /machine:$wcetgt"; last; };
+       { $wcecdefs.=" -D$wcetgt -D_$wcetgt_";
+         $wcelflag.=" /machine:$wcetgt";                       last; };
+    }
 
     $cc='$(CC)';
-    $base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -I$(WCECOMPAT)/include';
+    $base_cflags=' /W3 /WX /GF /Gy /nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -DOPENSSL_SMALL_FOOTPRINT';
     $base_cflags.=" $wcecdefs";
-    $opt_cflags=' /MD /Ox /O2 /Ob2';
-    $dbg_clfags=' /MDd /Od -DDEBUG -D_DEBUG';
+    $base_cflags.=' -I$(WCECOMPAT)/include'            if (defined($ENV{'WCECOMPAT'}));
+    $base_cflags.=' -I$(PORTSDK_LIBPATH)/../../include'        if (defined($ENV{'PORTSDK_LIBPATH'}));
+    $opt_cflags=' /MC /O1i';   # optimize for space, but with intrinsics...
+    $dbg_clfags=' /MC /Od -DDEBUG -D_DEBUG';
     $lflags="/nologo /opt:ref $wcelflag";
     }
 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='';
 
@@ -91,11 +127,12 @@ $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/)
        {
-       $ex_libs.=' $(WCECOMPAT)/lib/wcecompatex.lib';
+       $ex_libs.=' $(WCECOMPAT)/lib/wcecompatex.lib'   if (defined($ENV{'WCECOMPAT'}));
+       $ex_libs.=' $(PORTSDK_LIBPATH)/portlib.lib'     if (defined($ENV{'PORTSDK_LIBPATH'}));
        $ex_libs.=' /nodefaultlib:oldnames.lib coredll.lib corelibc.lib' if ($ENV{'TARGETCPU'} eq "X86");
        }
 else
@@ -111,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='';
@@ -158,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/)
@@ -196,6 +236,7 @@ ___
 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)';
@@ -206,10 +247,14 @@ $cflags.=" /Fd$out_def";
 sub do_lib_rule
        {
        local($objs,$target,$name,$shlib)=@_;
-       local($ret,$Name);
+       local($ret);
 
        $taget =~ s/\//$o/g if $o ne '/';
-       ($Name=$name) =~ tr/a-z/A-Z/;
+       if ($name ne "")
+               {
+               $name =~ tr/a-z/A-Z/;
+               $name = "/def:ms/${name}.def";
+               }
 
 #      $target="\$(LIB_D)$o$target";
        $ret.="$target: $objs\n";
@@ -221,18 +266,26 @@ sub do_lib_rule
                }
        else
                {
-               local($ex)=($target =~ /O_SSL/)?' $(L_CRYPTO)':'';
-               if ($FLAVOR =~ /CE/)
+               local($ex)=($target =~ /O_CRYPTO/)?'':' $(L_CRYPTO)';
+               if ($name eq "")
+                       {
+                       $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
+                       }
+               elsif ($FLAVOR =~ /CE/)
                        {
-                       $ex.=' winsock.lib $(WCECOMPAT)/lib/wcecompatex.lib';
+                       $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.=' wsock32.lib gdi32.lib advapi32.lib user32.lib';
+                       $ex.=' ws2_32.lib gdi32.lib advapi32.lib user32.lib';
                        $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
                        }
-               $ret.="\t\$(LINK) \$(MLFLAGS) $efile$target /def:ms/${Name}.def @<<\n  \$(SHLIB_EX_OBJ) $objs $ex\n<<\n";
+               $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);
@@ -246,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);
        }