From: Richard Levitte <levitte@openssl.org>
Date: Sun, 14 Jan 2018 21:39:20 +0000 (+0100)
Subject: Fix Windows build file template to recognise .res files
X-Git-Tag: OpenSSL_1_1_1-pre1~194
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=0973b47040df02bfa56e4a91b25621027467b16c;hp=27da42d85212f80fc0db02b1cedf1d49fbfb8c43

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)
---

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}});