Windows CE updates, contributed by Steven Reddie <smr@essemer.com.au>

[openssl.git] / util / mk1mf.pl

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index e6aa5c45c0dbbe9533dde23d5f39738905c6520d..8c6370bc5dcbb470550d520b834148a027a7d3bc 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -24,6 +24,7 @@ $infile="MINFO";
 
 %ops=(
        "VC-WIN32",   "Microsoft Visual C++ [4-6] - Windows NT or 9X",
+       "VC-CE",   "Microsoft eMbedded Visual C++ 3.0 - Windows CE ONLY",
        "VC-NT",   "Microsoft Visual C++ [4-6] - Windows NT ONLY",
        "VC-W31-16",  "Microsoft Visual C++ 1.52 - Windows 3.1 - 286",
        "VC-WIN16",   "Alias for VC-W31-32",
@@ -37,6 +38,7 @@ $infile="MINFO";
        "linux-elf","Linux elf",
        "ultrix-mips","DEC mips ultrix",
        "FreeBSD","FreeBSD distribution",
+       "OS2-EMX", "EMX GCC OS/2",
        "default","cc under unix",
        );
 
@@ -61,6 +63,8 @@ and [options] can be one of
        just-ssl                                - remove all non-ssl keys/digest
        no-asm                                  - No x86 asm
        no-krb5                                 - No KRB5
+       no-ec                                   - No EC
+       no-ecdsa                                - No ECDSA
        nasm                                    - Use NASM for x86 asm
        gaswin                                  - Use GNU as with Mingw32
        no-socks                                - No socket code
@@ -91,14 +95,14 @@ $no_mdc2=1 if ($no_des);
 $no_ssl3=1 if ($no_md5 || $no_sha);
 $no_ssl3=1 if ($no_rsa && $no_dh);
 
-$no_ssl2=1 if ($no_md5 || $no_rsa);
+$no_ssl2=1 if ($no_md5);
 $no_ssl2=1 if ($no_rsa);
 
 $out_def="out";
 $inc_def="outinc";
 $tmp_def="tmp";
 
-$mkdir="mkdir";
+$mkdir="-mkdir";
 
 ($ssl,$crypto)=("ssl","crypto");
 $ranlib="echo ranlib";
@@ -135,6 +139,10 @@ elsif (($platform eq "VC-WIN32") || ($platform eq "VC-NT"))
        $NT = 1 if $platform eq "VC-NT";
        require 'VC-32.pl';
        }
+elsif ($platform eq "VC-CE")
+       {
+       require 'VC-CE.pl';
+       }
 elsif ($platform eq "Mingw32")
        {
        require 'Mingw32.pl';
@@ -182,6 +190,11 @@ elsif ($platform eq "ultrix-mips")
        require "ultrix.pl";
        $unix=1;
        }
+elsif ($platform eq "OS2-EMX")
+       {
+       $wc=1;
+       require 'OS2-EMX.pl';
+       }
 else
        {
        require "unix.pl";
@@ -218,7 +231,9 @@ $cflags.=" -DOPENSSL_NO_SOCK" if $no_sock;
 $cflags.=" -DOPENSSL_NO_SSL2" if $no_ssl2;
 $cflags.=" -DOPENSSL_NO_SSL3" if $no_ssl3;
 $cflags.=" -DOPENSSL_NO_ERR"  if $no_err;
-$cflags.=" -DOPENSSL_NO_KRB5"  if $no_krb5;
+$cflags.=" -DOPENSSL_NO_KRB5" if $no_krb5;
+$cflags.=" -DOPENSSL_NO_EC"   if $no_ec;
+$cflags.=" -DOPENSSL_NO_ECDSA" if $no_ecdsa;
 #$cflags.=" -DRSAref"  if $rsaref ne "";
 
 ## if ($unix)
@@ -258,6 +273,17 @@ $defs= <<"EOF";
 # The one monster makefile better suits building in non-unix
 # environments.
 
+EOF
+
+if ($platform eq "VC-CE")
+       {
+       $defs.= <<"EOF";
+!INCLUDE <\$(WCECOMPAT)/wcedefs.mak>
+
+EOF
+       }
+
+$defs.= <<"EOF";
 INSTALLTOP=$INSTALLTOP
 
 # Set your compiler options
@@ -278,6 +304,7 @@ SRC_D=$src_dir
 
 LINK=$link
 LFLAGS=$lflags
+RSC=$rsc
 
 BN_ASM_OBJ=$bn_asm_obj
 BN_ASM_SRC=$bn_asm_src
@@ -590,6 +617,18 @@ foreach (values %lib_nam)
        $rules.=&do_compile_rule("\$(OBJ_D)",$lib_obj{$_},$lib);
        }
 
+# hack to add version info on MSVC
+if (($platform eq "VC-WIN32") || ($platform eq "VC-NT")) {
+    $rules.= <<"EOF";
+\$(OBJ_D)\\\$(CRYPTO).res: ms\\version32.rc
+       \$(RSC) /fo"\$(OBJ_D)\\\$(CRYPTO).res" /d CRYPTO ms\\version32.rc
+
+\$(OBJ_D)\\\$(SSL).res: ms\\version32.rc
+       \$(RSC) /fo"\$(OBJ_D)\\\$(SSL).res" /d SSL ms\\version32.rc
+
+EOF
+}
+
 $defs.=&do_defs("T_EXE",$test,"\$(TEST_D)",$exep);
 foreach (split(/\s+/,$test))
        {
@@ -745,6 +784,14 @@ sub do_defs
                $Vars{$var}.="$t ";
                $ret.=$t;
                }
+       # hack to add version info on MSVC
+       if ($shlib && ($platform eq "VC-WIN32") || ($platform eq "VC-NT"))
+               {
+               if ($var eq "CRYPTOOBJ")
+                       { $ret.="\$(OBJ_D)\\\$(CRYPTO).res "; }
+               elsif ($var eq "SSLOBJ")
+                       { $ret.="\$(OBJ_D)\\\$(SSL).res "; }
+               }
        chop($ret);
        $ret.="\n\n";
        return($ret);
@@ -867,7 +914,7 @@ sub read_options
        elsif (/^no-dsa$/)      { $no_dsa=1; }
        elsif (/^no-dh$/)       { $no_dh=1; }
        elsif (/^no-hmac$/)     { $no_hmac=1; }
-       elsif (/^no-rijndael$/) { $no_rijndael=1; }
+       elsif (/^no-aes$/)      { $no_aes=1; }
        elsif (/^no-asm$/)      { $no_asm=1; }
        elsif (/^nasm$/)        { $nasm=1; }
        elsif (/^gaswin$/)      { $gaswin=1; }
@@ -876,6 +923,8 @@ sub read_options
        elsif (/^no-err$/)      { $no_err=1; }
        elsif (/^no-sock$/)     { $no_sock=1; }
        elsif (/^no-krb5$/)     { $no_krb5=1; }
+       elsif (/^no-ec$/)       { $no_ec=1; }
+       elsif (/^no-ecdsa$/)    { $no_ecdsa=1; }
 
        elsif (/^just-ssl$/)    { $no_rc2=$no_idea=$no_des=$no_bf=$no_cast=1;
                                  $no_md2=$no_sha=$no_mdc2=$no_dsa=$no_dh=1;