diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-03-17 22:29:20 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-03-21 11:00:21 +0100 |
| commit | 0ef1ce49eeed417c143a8c1bf77ce0d843306e3d (patch) | |
| tree | fd888edc44429d7527a9853a4f8bc6ab9a0920a5 /Configurations | |
| parent | 753585b94897f5628cf9c13d8a6c97861074febb (diff) | |
| download | openssl-0ef1ce49eeed417c143a8c1bf77ce0d843306e3d.zip openssl-0ef1ce49eeed417c143a8c1bf77ce0d843306e3d.tar.gz openssl-0ef1ce49eeed417c143a8c1bf77ce0d843306e3d.tar.bz2 | |
Remove generation of ms/version32.rc from Configure, use util/mkrc.pl
utils/mkrc.pl was added a while ago as a better generator for the
Windows DLL resource file. Finalize the change by removing the
ms/version32.rc generator from Configure and adding resource file
support using mkrc.pl in Configurations/windows-makefile.pl
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/10-main.conf | 2 | ||||
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 8716096..5b64803 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1222,6 +1222,8 @@ sub vc_wince_info { cc => "cl", cflags => "-W3 -wd4090 -Gs0 -GF -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE", coutflag => "/Fo", + rc => "rc", + rcoutflag => "/fo", lib_cflags => sub { join(" ", ($disabled{shared} ? "/Zl" : ()), "/Zi /Fdlib") }, diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index e4faa95..89c9e49c 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -97,6 +97,8 @@ ENGINESDIR={- use File::Spec::Functions; CC={- $target{cc} -} CFLAGS={- join(" ",(map { "-D".$_} @{$target{defines}}, @{$config{defines}})) -} {- join(" ", quotify_l("-DENGINESDIR=\"$enginesdir\"", "-DOPENSSLDIR=\"$openssldir\"")) -} {- $target{cflags} -} {- $config{cflags} -} COUTFLAG={- $target{coutflag} || "/Fo" -} +RC={- $target{rc} || "rc" -} +RCOUTFLAG={- $target{rcoutflag} || "/fo" -} LD={- $target{ld} || "link" -} LDFLAGS={- $target{lflags} -} LDOUTFLAG={- $target{loutflag} || "/out:" -} @@ -343,15 +345,20 @@ EOF my $mkdef_pl = abs2rel(rel2abs(catfile($config{sourcedir}, "util", "mkdef.pl")), rel2abs($config{builddir})); + my $mkrc_pl = abs2rel(rel2abs(catfile($config{sourcedir}, + "util", "mkrc.pl")), + rel2abs($config{builddir})); my $target = shlib_import($lib); return <<"EOF" $target: $deps $ordinalsfile $mkdef_pl \$(PERL) $mkdef_pl "$mkdef_key" 32 > $shlib.def \$(PERL) -i.tmp -pe "s|^LIBRARY\\s+${mkdef_key}32|LIBRARY $shlib|;" $shlib.def DEL $shlib.def.tmp + \$(PERL) $mkrc_pl $shlib$shlibext > $shlib.rc + \$(RC) \$(RCOUTFLAG)$shlib.res $shlib.rc \$(LD) \$(LDFLAGS) \$(LIB_LDFLAGS) \\ /implib:$target \$(LDOUTFLAG)$shlib$shlibext /def:$shlib.def @<< -$objs$linklibs \$(EX_LIBS) +$objs $shlib.res$linklibs \$(EX_LIBS) << DEL /F apps\\$shlib$shlibext DEL /F test\\$shlib$shlibext |