diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-01-14 22:39:20 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-01-15 09:40:51 +0100 |
| commit | 0973b47040df02bfa56e4a91b25621027467b16c (patch) | |
| tree | 518e9d97630d87a870e3b1d23f5353bbbce012de /Configurations | |
| parent | 27da42d85212f80fc0db02b1cedf1d49fbfb8c43 (diff) | |
Fix Windows build file template to recognise .res files
Only when building the main shared libraries
Fixes #5075
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5077)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 51094f7ab8..66529a2eda 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -501,7 +501,7 @@ EOF my $lib = $args{lib}; my $shlib = $args{shlib}; my @objs = map { (my $x = $_) =~ s|\.o$|$objext|; $x } - grep { $_ =~ m|\.o$| } + grep { $_ =~ m/\.(?:o|res)$/ } @{$args{objs}}; my @defs = grep { $_ =~ /\.def$/ } @{$args{objs}}; my @deps = compute_lib_depends(@{$args{deps}}); |