Remove uidlg library from VC-32.pl, it is now bound at runtime.
[openssl.git] / util / pl / VC-32.pl
index 3276525c8550d2ae5639cc454d1ec0ccc29a8c36..a20e73566b14a66f71129c36b7d3144546eaec25 100644 (file)
@@ -7,8 +7,11 @@ $ssl=  "ssleay32";
 $crypto="libeay32";
 
 $o='\\';
-$cp='copy nul+';       # Timestamps get stuffed otherwise
-$rm='del';
+$cp='$(PERL) util/copy.pl';
+$mkdir='$(PERL) util/mkdir-p.pl';
+$rm='del /Q';
+
+$zlib_lib="zlib1.lib";
 
 # C compiler stuff
 $cc='cl';
@@ -25,10 +28,28 @@ if ($FLAVOR =~ /WIN64/)
     # per 0.9.8 release remaining warnings were explicitly examined and
     # 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';
-    $opt_cflags=' /MD /Ox';
-    $dbg_cflags=' /MDd /Od -DDEBUG -D_DEBUG';
+    $base_cflags= " $mf_cflag";
+    my $f = $shlib?' /MD':' /MT';
+    $lib_cflag='/Zl' if (!$shlib);     # remove /DEFAULTLIBs from static lib
+    $opt_cflags=$f.' /Ox';
+    $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
     $lflags="/nologo /subsystem:console /opt:ref";
+
+    *::perlasm_compile_target = sub {
+       my ($target,$source,$bname)=@_;
+       my $ret;
+
+       $bname =~ s/(.*)\.[^\.]$/$1/;
+       $ret=<<___;
+\$(TMP_D)$o$bname.asm: $source
+       set ASM=\$(ASM)
+       \$(PERL) $source \$\@
+
+$target: \$(TMP_D)$o$bname.asm
+       \$(ASM) $afile\$\@ \$(TMP_D)$o$bname.asm
+
+___
+       }
     }
 elsif ($FLAVOR =~ /CE/)
     {
@@ -37,32 +58,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 .= " -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';
-    $opt_cflags=' /MD /Ox /O2 /Ob2';
-    $dbg_cflags=' /MDd /Od -DDEBUG -D_DEBUG';
-    $lflags="/nologo /subsystem:console /machine:I386 /opt:ref";
+    $base_cflags= " $mf_cflag";
+    my $f = $shlib?' /MD':' /MT';
+    $lib_cflag='/Zl' if (!$shlib);     # remove /DEFAULTLIBs from static lib
+    $opt_cflags=$f.' /Ox /O2 /Ob2';
+    $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
+    $lflags="/nologo /subsystem:console /opt:ref";
     }
 $mlflags='';
 
@@ -82,6 +134,7 @@ else
        }
 
 $obj='.obj';
+$asm_suffix='.asm';
 $ofile="/Fo";
 
 # EXE linking stuff
@@ -91,25 +144,21 @@ $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 cryptapi.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
        {
-       $ex_libs.=' gdi32.lib advapi32.lib user32.lib';
+       $ex_libs.=' gdi32.lib advapi32.lib crypt32.lib user32.lib';
        $ex_libs.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
-       }
-
-# As native NT API is pure UNICODE, our WIN-NT build defaults to UNICODE,
-# but gets linked with unicows.lib to ensure backward compatibility.
-if ($FLAVOR =~ /NT/)
-       {
-       $cflags.=" -DOPENSSL_SYSNAME_WINNT -DUNICODE -D_UNICODE";
-       $ex_libs="unicows.lib $ex_libs";
+       # 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
@@ -122,13 +171,32 @@ $lfile='/out:';
 
 $shlib_ex_obj="";
 $app_ex_obj="setargv.obj" if ($FLAVOR !~ /CE/);
-if ($nasm) {
-       $asm='nasmw -f win32';
+if ($FLAVOR =~ /WIN64A/) {
+       if (`nasm -v` =~ /NASM version ([0-9]+\.[0-9]+)/ && $1 >= 2.0) {
+               $asm='nasm -f win64';
+               $asm.=' -g' if $debug;
+               $afile='-o ';
+       } else {
+               $asm='ml64 /c /Cp /Cx';
+               $asm.=" /Zi" if $debug;
+               $afile='/Fo';
+       }
+} elsif ($FLAVOR =~ /WIN64I/) {
+       $asm='ias';
+       $asm.=" -d debug" if $debug;
+       $afile="-o ";
+} elsif ($nasm) {
+       my $ver=`nasm -v 2>NUL`;
+       my $vew=`nasmw -v 2>NUL`;
+       # pick newest version
+       $asm=($ver gt $vew?"nasm":"nasmw")." -f win32";
+       $asmtype="win32n";
        $afile='-o ';
 } else {
        $asm='ml /Cp /coff /c /Cx';
        $asm.=" /Zi" if $debug;
        $afile='/Fo';
+       $asmtype="win32";
 }
 
 $bn_asm_obj='';
@@ -140,31 +208,24 @@ $bf_enc_src='';
 
 if (!$no_asm)
        {
-       $bn_asm_obj='crypto\bn\asm\bn_win32.obj';
-       $bn_asm_src='crypto\bn\asm\bn_win32.asm';
-       $des_enc_obj='crypto\des\asm\d_win32.obj crypto\des\asm\y_win32.obj';
-       $des_enc_src='crypto\des\asm\d_win32.asm crypto\des\asm\y_win32.asm';
-       $bf_enc_obj='crypto\bf\asm\b_win32.obj';
-       $bf_enc_src='crypto\bf\asm\b_win32.asm';
-       $cast_enc_obj='crypto\cast\asm\c_win32.obj';
-       $cast_enc_src='crypto\cast\asm\c_win32.asm';
-       $rc4_enc_obj='crypto\rc4\asm\r4_win32.obj';
-       $rc4_enc_src='crypto\rc4\asm\r4_win32.asm';
-       $rc5_enc_obj='crypto\rc5\asm\r5_win32.obj';
-       $rc5_enc_src='crypto\rc5\asm\r5_win32.asm';
-       $md5_asm_obj='crypto\md5\asm\m5_win32.obj';
-       $md5_asm_src='crypto\md5\asm\m5_win32.asm';
-       $sha1_asm_obj='crypto\sha\asm\s1_win32.obj';
-       $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";
+       win32_import_asm($mf_bn_asm, "bn", \$bn_asm_obj, \$bn_asm_src);
+       win32_import_asm($mf_aes_asm, "aes", \$aes_asm_obj, \$aes_asm_src);
+       win32_import_asm($mf_des_asm, "des", \$des_enc_obj, \$des_enc_src);
+       win32_import_asm($mf_bf_asm, "bf", \$bf_enc_obj, \$bf_enc_src);
+       win32_import_asm($mf_cast_asm, "cast", \$cast_enc_obj, \$cast_enc_src);
+       win32_import_asm($mf_rc4_asm, "rc4", \$rc4_enc_obj, \$rc4_enc_src);
+       win32_import_asm($mf_rc5_asm, "rc5", \$rc5_enc_obj, \$rc5_enc_src);
+       win32_import_asm($mf_md5_asm, "md5", \$md5_asm_obj, \$md5_asm_src);
+       win32_import_asm($mf_sha_asm, "sha", \$sha1_asm_obj, \$sha1_asm_src);
+       win32_import_asm($mf_rmd_asm, "ripemd", \$rmd160_asm_obj, \$rmd160_asm_src);
+       win32_import_asm($mf_wp_asm, "whrlpool", \$whirlpool_asm_obj, \$whirlpool_asm_src);
+       win32_import_asm($mf_cpuid_asm, "", \$cpuid_asm_obj, \$cpuid_asm_src);
+       $perl_asm = 1;
        }
 
 if ($shlib && $FLAVOR !~ /CE/)
        {
        $mlflags.=" $lflags /dll";
-#      $cflags =~ s| /MD| /MT|;
        $lib_cflag=" -D_WINDLL";
        $out_def="out32dll";
        $tmp_def="tmp32dll";
@@ -196,6 +257,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 +268,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 +287,32 @@ 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.=' winsock.lib $(WCECOMPAT)/lib/wcecompatex.lib';
+                       $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
+                       if ($target =~ /capi/)
+                               {
+                               $ex.=' crypt32.lib advapi32.lib';
+                               }
+                       }
+               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.=' wsock32.lib gdi32.lib advapi32.lib user32.lib';
+                       $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/);
                        }
-               $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 -nologo -manifest \$@.manifest -outputresource:\$@;2\n\n";
                }
        $ret.="\n";
        return($ret);
@@ -246,9 +326,37 @@ 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 -nologo -manifest \$@.manifest -outputresource:\$@;1\n\n";
        return($ret);
        }
 
+sub win32_import_asm
+       {
+       my ($mf_var, $asm_name, $oref, $sref) = @_;
+       my $asm_dir;
+       if ($asm_name eq "")
+               {
+               $asm_dir = "crypto\\";
+               }
+       else
+               {
+               $asm_dir = "crypto\\$asm_name\\asm\\";
+               }
+
+       $$oref = "";
+       $mf_var =~ s/\.o$/.obj/g;
+
+       foreach (split(/ /, $mf_var))
+               {
+               $$oref .= $asm_dir . $_ . " ";
+               }
+       $$oref =~ s/ $//;
+       $$sref = $$oref;
+       $$sref =~ s/\.obj/.asm/g;
+
+       }
+
+
 1;