Module: wine Branch: master Commit: d7a5ff025eb5ba2c43e58eef4386004cbbd35253 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7a5ff025eb5ba2c43e58eef43...
Author: Rob Shearman robertshearman@gmail.com Date: Thu Sep 25 16:43:14 2008 +0100
msvcmaker: Fix generated imports for Wine modules and link with delayed imports.
---
tools/winapi/msvcmaker | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index f32f28a..36fecb4 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -170,6 +170,8 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) { $testdll = $1; } elsif (/^IMPORTS\s*=\s*/) { push @imports, grep !/^ntdll$/, split /\s+/s, $'; + } elsif (/^DELAYIMPORTS\s*=\s*/) { + push @imports, $; } elsif (/^EXTRALIBS\s*=\s*/) { push @imports, map { /^-l(dxerr8|dxerr9|dxguid|strmiids|uuid)$/ ? $1 : () } split /\s+/s, $'; } elsif (/^CTESTS\s*=\s*/) { @@ -288,7 +290,7 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) { $modules{$module}{source_files} = $source_files; $modules{$module}{header_files} = $header_files; $modules{$module}{resource_files} = $resource_files; - $modules{$module}{imports} = []; + $modules{$module}{imports} = [@imports]; }
$wine_test_dsp_files{"wineruntests.dsp"}{files} = ["runtests.c"];