Add support for C++ in Configurations/unix-Makefile.tmpl

[openssl.git] / Configurations / 00-base-templates.conf

diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index b7dcde0b68d70ff6b9d8cd1e09c9d8d8c2af9218..8bb4de75f90ce7099914702c18af8402d2146b3a 100644 (file)
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -35,21 +35,20 @@
        shared_ldflag   => "",
        shared_rcflag   => "",
        shared_extension        => "",
+
+        build_scheme    => [ "unified", "unix" ],
+        build_file      => "Makefile",
     },
 
     BASE_common => {
        template        => 1,
        defines         =>
-           [ sub {
-               unless ($disabled{zlib}) {
-                   if (defined($disabled{"zlib-dynamic"})) {
-                       return "ZLIB";
-                   } else {
-                       return "ZLIB_SHARED";
-                   }
-               }
-               return (); }
-           ],
+           sub {
+                my @defs = ();
+                push @defs, "ZLIB" unless $disabled{zlib};
+                push @defs, "ZLIB_SHARED" unless $disabled{"zlib-dynamic"};
+                return [ @defs ];
+            },
     },
 
     BASE_unix => {
@@ -81,31 +80,32 @@
             sub {
                 unless ($disabled{zlib}) {
                     if (defined($disabled{"zlib-dynamic"})) {
-                        return "zlib1.lib";
+                        return $withargs{zlib_lib};
                     }
                 }
                 return (); },
 
-        build_scheme    => [ "mk1mf" ],
+        ld              => "link",
+        lflags          => "/nologo",
+        loutflag        => "/out:",
+        ar              => "lib",
+        arflags         => "/nologo",
+        aroutflag       => "/out:",
+        rc               => "rc",
+        rcoutflag        => "/fo",
+        mt              => "mt",
+        mtflags         => "-nologo",
+        mtinflag        => "-manifest ",
+        mtoutflag       => "-outputresource:",
+
+        build_file      => "makefile",
+        build_scheme    => [ "unified", "windows" ],
     },
 
     BASE_VMS => {
         inherit_from    => [ "BASE_common" ],
         template        => 1,
 
-        ex_libs          =>
-            sub {
-                unless ($disabled{zlib}) {
-                    if (defined($disabled{"zlib-dynamic"})) {
-                        if (defined($withargs{zlib_lib})) {
-                            return $withargs{zlib_lib}.'GNV$LIBZSHR.EXE/SHARED'
-                        } else {
-                            return 'GNV$LIBZSHR/SHARE';
-                        }
-                    }
-                }
-                return (); },
-
         build_file       => "descrip.mms",
         build_scheme     => [ "unified", "VMS" ],
     },
@@ -114,7 +114,7 @@
        template        => 1,
        apps_aux_src    => add("../ms/applink.c"),
        uplink_aux_src  => add("../ms/uplink.c"),
-       shared_defines  => add("OPENSSL_USE_APPLINK", { separator => undef }),
+       defines         => add("OPENSSL_USE_APPLINK"),
     },
     x86_uplink => {
        inherit_from    => [ "uplink_common" ],
@@ -188,14 +188,14 @@
     sparcv9_asm => {
        template        => 1,
        cpuid_asm_src   => "sparcv9cap.c sparccpuid.S",
-       bn_asm_src      => "asm/sparcv8plus.S sparcv9-mont.s sparcv9a-mont.s vis3-mont.s sparct4-mont.S sparcv9-gf2m.S",
+       bn_asm_src      => "asm/sparcv8plus.S sparcv9-mont.S sparcv9a-mont.S vis3-mont.S sparct4-mont.S sparcv9-gf2m.S",
        ec_asm_src      => "ecp_nistz256.c ecp_nistz256-sparcv9.S",
-       des_asm_src     => "des_enc-sparc.S fcrypt_b.c dest4-sparcv9.s",
-       aes_asm_src     => "aes_core.c aes_cbc.c aes-sparcv9.s aest4-sparcv9.s",
+       des_asm_src     => "des_enc-sparc.S fcrypt_b.c dest4-sparcv9.S",
+       aes_asm_src     => "aes_core.c aes_cbc.c aes-sparcv9.S aest4-sparcv9.S aesfx-sparcv9.S",
        md5_asm_src     => "md5-sparcv9.S",
        sha1_asm_src    => "sha1-sparcv9.S sha256-sparcv9.S sha512-sparcv9.S",
-       cmll_asm_src    => "camellia.c cmll_misc.c cmll_cbc.c cmllt4-sparcv9.s",
-       modes_asm_src   => "ghash-sparcv9.s",
+       cmll_asm_src    => "camellia.c cmll_misc.c cmll_cbc.c cmllt4-sparcv9.S",
+       modes_asm_src   => "ghash-sparcv9.S",
        poly1305_asm_src=> "poly1305-sparcv9.S",
        perlasm_scheme  => "void"
     },
@@ -209,25 +209,26 @@
     alpha_asm => {
        template        => 1,
        cpuid_asm_src   => "alphacpuid.s",
-       bn_asm_src      => "bn_asm.c alpha-mont.s",
-       sha1_asm_src    => "sha1-alpha.s",
-       modes_asm_src   => "ghash-alpha.s",
+       bn_asm_src      => "bn_asm.c alpha-mont.S",
+       sha1_asm_src    => "sha1-alpha.S",
+       modes_asm_src   => "ghash-alpha.S",
        perlasm_scheme  => "void"
     },
     mips32_asm => {
        template        => 1,
-       bn_asm_src      => "bn-mips.s mips-mont.s",
+       bn_asm_src      => "bn-mips.S mips-mont.S",
        aes_asm_src     => "aes_cbc.c aes-mips.S",
        sha1_asm_src    => "sha1-mips.S sha256-mips.S",
     },
     mips64_asm => {
        inherit_from    => [ "mips32_asm" ],
        template        => 1,
-       sha1_asm_src    => add("sha512-mips.S")
+       sha1_asm_src    => add("sha512-mips.S"),
+       poly1305_asm_src=> "poly1305-mips.S",
     },
     s390x_asm => {
        template        => 1,
-       cpuid_asm_src   => "s390xcap.c s390xcpuid.s",
+       cpuid_asm_src   => "s390xcap.c s390xcpuid.S",
        bn_asm_src      => "asm/s390x.S s390x-mont.S s390x-gf2m.s",
        aes_asm_src     => "aes-s390x.S aes-ctr.fake aes-xts.fake",
        sha1_asm_src    => "sha1-s390x.S sha256-s390x.S sha512-s390x.S",
@@ -250,7 +251,7 @@
     },
     aarch64_asm => {
        template        => 1,
-       cpuid_asm_src   => "armcap.c arm64cpuid.S mem_clr.c",
+       cpuid_asm_src   => "armcap.c arm64cpuid.S",
        ec_asm_src      => "ecp_nistz256.c ecp_nistz256-armv8.S",
        bn_asm_src      => "bn_asm.c armv8-mont.S",
        aes_asm_src     => "aes_core.c aes_cbc.c aesv8-armx.S vpaes-armv8.S",
@@ -274,7 +275,7 @@
        inherit_from    => [ "parisc11_asm" ],
        perlasm_scheme  => "64",
     },
-    ppc64_asm => {
+    ppc32_asm => {
        template        => 1,
        cpuid_asm_src   => "ppccpuid.s ppccap.c",
        bn_asm_src      => "bn-ppc.s ppc-mont.s ppc64-mont.s",
@@ -284,8 +285,10 @@
        chacha_asm_src  => "chacha-ppc.s",
        poly1305_asm_src=> "poly1305-ppc.s poly1305-ppcfp.s",
     },
-    ppc32_asm => {
-       inherit_from    => [ "ppc64_asm" ],
-       template        => 1
+    ppc64_asm => {
+       inherit_from    => [ "ppc32_asm" ],
+       template        => 1,
+       ec_asm_src      => "ecp_nistz256.c ecp_nistz256-ppc64.s",
+
     },
 );