From 1e8ae82e2cc25e9a4d877d387e06796c829e4694 Mon Sep 17 00:00:00 2001 From: Wojciech Kaluza Date: Sun, 21 Apr 2019 12:14:34 +0100 Subject: [PATCH] Add RCFLAGS variable in Windows build file, and use it - Allow user-defined RCFLAGS - Pass RCFLAGS to RC Reviewed-by: Tim Hudson Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/8803) (cherry picked from commit a583172dac8bce37e268943e570968f193e8b64b) --- Configurations/windows-makefile.tmpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index d420bfff34..8ef70b8699 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -187,6 +187,7 @@ AS={- $config{AS} -} ASFLAGS={- join(' ', @{$config{ASFLAGS}}) -} RC={- $config{RC} -} +RCFLAGS={- join(' ', @{$config{RCFLAGS}}) -} ECHO="$(PERL)" "$(SRCDIR)\util\echo.pl" @@ -586,7 +587,7 @@ EOF if ($srcs[0] =~ /\.rc$/) { return <<"EOF"; $args{obj}: $deps - \$(RC) \$(RCOUTFLAG)\$\@ $srcs + \$(RC) \$(RCFLAGS) \$(RCOUTFLAG)\$\@ $srcs EOF } (my $obj = $args{obj}) =~ s|\.o$||; -- 2.25.1