Commit d7a5ff02 authored by Rob Shearman's avatar Rob Shearman Committed by Alexandre Julliard

msvcmaker: Fix generated imports for Wine modules and link with delayed imports.

parent 6d11ecff
...@@ -170,6 +170,8 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) { ...@@ -170,6 +170,8 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) {
$testdll = $1; $testdll = $1;
} elsif (/^IMPORTS\s*=\s*/) { } elsif (/^IMPORTS\s*=\s*/) {
push @imports, grep !/^ntdll$/, split /\s+/s, $'; push @imports, grep !/^ntdll$/, split /\s+/s, $';
} elsif (/^DELAYIMPORTS\s*=\s*/) {
push @imports, $;
} elsif (/^EXTRALIBS\s*=\s*/) { } elsif (/^EXTRALIBS\s*=\s*/) {
push @imports, map { /^-l(dxerr8|dxerr9|dxguid|strmiids|uuid)$/ ? $1 : () } split /\s+/s, $'; push @imports, map { /^-l(dxerr8|dxerr9|dxguid|strmiids|uuid)$/ ? $1 : () } split /\s+/s, $';
} elsif (/^CTESTS\s*=\s*/) { } elsif (/^CTESTS\s*=\s*/) {
...@@ -288,7 +290,7 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) { ...@@ -288,7 +290,7 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) {
$modules{$module}{source_files} = $source_files; $modules{$module}{source_files} = $source_files;
$modules{$module}{header_files} = $header_files; $modules{$module}{header_files} = $header_files;
$modules{$module}{resource_files} = $resource_files; $modules{$module}{resource_files} = $resource_files;
$modules{$module}{imports} = []; $modules{$module}{imports} = [@imports];
} }
$wine_test_dsp_files{"wineruntests.dsp"}{files} = ["runtests.c"]; $wine_test_dsp_files{"wineruntests.dsp"}{files} = ["runtests.c"];
......
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