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:
parent
f32ec6430b
commit
07ca2b4527
|
@ -120,6 +120,7 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) {
|
||||||
my $module;
|
my $module;
|
||||||
my $testdll;
|
my $testdll;
|
||||||
my @imports;
|
my @imports;
|
||||||
|
my $type;
|
||||||
|
|
||||||
my %vars;
|
my %vars;
|
||||||
|
|
||||||
|
@ -164,8 +165,8 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) {
|
||||||
next MAKEFILE_IN;
|
next MAKEFILE_IN;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} elsif(/^LIBRARY\s*=\s*(\S+)\s*$/) {
|
} elsif (/^\@MAKE_IMPLIB_RULES\@/) {
|
||||||
$module = $1 . "\.lib";
|
$type = "lib";
|
||||||
} elsif(/^TOPOBJDIR\s*=\s*(\S+)\s*$/) {
|
} elsif(/^TOPOBJDIR\s*=\s*(\S+)\s*$/) {
|
||||||
$topobjdir = $1;
|
$topobjdir = $1;
|
||||||
} elsif (/^TESTDLL\s*=\s*(\S+)\s*$/) {
|
} 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 =~ s/\.(?:dll|exe|lib)$//;
|
||||||
$project =~ y/./_/;
|
$project =~ y/./_/;
|
||||||
|
|
||||||
my $type;
|
|
||||||
if($module =~ /\.exe$/) {
|
if($module =~ /\.exe$/) {
|
||||||
$type = "exe";
|
$type = "exe";
|
||||||
} elsif($module =~ /\.lib$/) {
|
} elsif($module =~ /\.lib$/) {
|
||||||
$type = "lib";
|
$type = "lib";
|
||||||
} else {
|
} elsif(!$type) {
|
||||||
$type = "dll";
|
$type = "dll";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -449,7 +449,8 @@ sub _generate_dsp($$) {
|
||||||
|
|
||||||
if ($project !~ /^wine(?:build|runtests|test)?$/ &&
|
if ($project !~ /^wine(?:build|runtests|test)?$/ &&
|
||||||
$project !~ /^(?:gdi32)_.+?$/ &&
|
$project !~ /^(?:gdi32)_.+?$/ &&
|
||||||
$project !~ /_test$/)
|
$project !~ /_test$/ &&
|
||||||
|
!$lib)
|
||||||
{
|
{
|
||||||
push @source_files, "$base_module.spec";
|
push @source_files, "$base_module.spec";
|
||||||
@source_files = sort(@source_files);
|
@source_files = sort(@source_files);
|
||||||
|
|
Loading…
Reference in New Issue