From 6ddb62a575a31940785fdf3db8a24ca6006e5d2a Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Wed, 23 Mar 2016 20:33:29 +0100 Subject: Build system: VC-WIN64I fixups. Reviewed-by: Richard Levitte --- Configurations/windows-makefile.tmpl | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'Configurations/windows-makefile.tmpl') diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 0b8ac72d58..00149c3b67 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -154,7 +154,8 @@ install: install_sw install_ssldirs install_docs uninstall: uninstall_docs uninstall_sw libclean: - del /Q /F $(LIBS) $(SHLIBS) + $(PERL) -e "map { m/(.*)\.dll$$/; unlink glob """$$1.*""" } @ARGV" $(SHLIBS) + del /Q /F $(LIBS) del lib.pdb clean: libclean @@ -227,7 +228,7 @@ configdata.pm: {- $config{build_file_template} -} $(SRCDIR)\Configure @echo "*** Please run the same make command again ***" @echo "*** ***" @echo "**************************************************" - @( exit 1 ) + @exit 1 {- use File::Basename; @@ -294,12 +295,8 @@ EOF sub src2obj { my %args = @_; my $obj = $args{obj}; - my @srcs = map { if ($unified_info{generate}->{$_}) { - (my $x = $_) =~ s/\.[sS]$/.asm/; $x - } else { - $_ - } - } ( @{$args{srcs}} ); + my @srcs = map { (my $x = $_) =~ s/\.s$/.asm/; $x + } ( @{$args{srcs}} ); my $srcs = join(" ", @srcs); my $deps = join(" ", @srcs, @{$args{deps}}); my $incs = join("", map { " /I ".$_ } @{$args{incs}}); -- cgit v1.2.3