Skip to content

W
wine-cw
Commit 9b7ca823 authored by Tony Wasserka's avatar Tony Wasserka Committed by Alexandre Julliard
Browse files
Options

make_makefiles: Fix importlib handling.

parent 4f148c28
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 9 deletions
tools/make_makefiles
View file @ 9b7ca823
...@@ -526,12 +526,9 @@ sub update_dlls(@) ...@@ -526,12 +526,9 @@ sub update_dlls(@)
} }
foreach my $mod (sort keys %importlibs) foreach my $mod (sort keys %importlibs)
{ {
my $dir = $directories{$mod}; $text .= " \\\n\t$directories{$mod}/$importlibs{$mod}.\$(IMPLIBEXT)";
my $def = $mod;
$def =~ s/\.(dll|drv)$//;
$text .= sprintf " \\\n\t%s/lib%s.\$(IMPLIBEXT)", $dir, $def;
next unless defined $static_implibs{$mod}; next unless defined $static_implibs{$mod};
$text .= sprintf " \\\n\t%s/lib%s.\$(STATIC_IMPLIBEXT)", $dir, $def $text .= " \\\n\t$directories{$mod}/$importlibs{$mod}.\$(STATIC_IMPLIBEXT)";
} }
$text .= "\n\n"; $text .= "\n\n";
$text .= "implib: \$(IMPORT_LIBS)\n\n"; $text .= "implib: \$(IMPORT_LIBS)\n\n";
...@@ -588,10 +585,7 @@ sub update_dlls(@) ...@@ -588,10 +585,7 @@ sub update_dlls(@)
} }
foreach my $mod (sort keys %importlibs) foreach my $mod (sort keys %importlibs)
{ {
my $dir = $directories{$mod}; push @ignores, "dlls/$directories{$mod}/$importlibs{$mod}.def";
my $def = $mod;
$def =~ s/\.(dll|drv)$//;
push @ignores, "dlls/$dir/lib$def.def";
} }
return @ignores; return @ignores;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment