From 0973b47040df02bfa56e4a91b25621027467b16c Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Sun, 14 Jan 2018 22:39:20 +0100 Subject: [PATCH] Fix Windows build file template to recognise .res files Only when building the main shared libraries Fixes #5075 Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/5077) --- Configurations/windows-makefile.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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}}); -- 2.25.1