ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcmaker: Fix detection of static libraries. 

Also don't generate a custom build step for the .spec file for static
libraries, since they don't have a .spec file.
This commit is contained in:
Rob Shearman 2008-09-25 16:44:23 +01:00 committed by Alexandre Julliard
parent f32ec6430b
commit 07ca2b4527
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/winapi/msvcmaker
View File

@ -120,6 +120,7 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) {
my $module;
my $testdll;
my @imports;
my $type;
my %vars;
@ -164,8 +165,8 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) {
next MAKEFILE_IN;
}
}
} elsif(/^LIBRARY\s*=\s*(\S+)\s*$/) {
$module = $1 . "\.lib";
} elsif (/^\@MAKE_IMPLIB_RULES\@/) {
$type = "lib";
} elsif(/^TOPOBJDIR\s*=\s*(\S+)\s*$/) {
$topobjdir = $1;
} elsif (/^TESTDLL\s*=\s*(\S+)\s*$/) {
@ -249,12 +250,11 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) {
$project =~ s/\.(?:dll|exe|lib)$//;
$project =~ y/./_/;
my $type;
if($module =~ /\.exe$/) {
$type = "exe";
} elsif($module =~ /\.lib$/) {
$type = "lib";
} else {
} elsif(!$type) {
$type = "dll";
}
@ -449,7 +449,8 @@ sub _generate_dsp($$) {
if ($project !~ /^wine(?:build|runtests|test)?$/ &&
$project !~ /^(?:gdi32)_.+?$/ &&
$project !~ /_test$/)
$project !~ /_test$/ &&
!$lib)
{
push @source_files, "$base_module.spec";
@source_files = sort(@source_files);