mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-31 10:41:12 +00:00
msvcmaker: "MODULE = none" is obsolete.
This commit is contained in:
parent
c7c8d3ccfc
commit
dbbf8f8ade
1 changed files with 6 additions and 12 deletions
|
@ -180,16 +180,6 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) {
|
||||||
|
|
||||||
if(/^MODULE\s*=\s*([\w\.]+)$/) {
|
if(/^MODULE\s*=\s*([\w\.]+)$/) {
|
||||||
$module = $1;
|
$module = $1;
|
||||||
|
|
||||||
if($module eq "none") {
|
|
||||||
if($makefile_in_file eq "tools/winebuild/Makefile.in") {
|
|
||||||
$module = "winebuild.exe";
|
|
||||||
} elsif ($makefile_in_file eq "include/Makefile.in") {
|
|
||||||
$module = "include.lib";
|
|
||||||
} else {
|
|
||||||
next MAKEFILE_IN;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} elsif (/^\@MAKE_IMPLIB_RULES\@/) {
|
} elsif (/^\@MAKE_IMPLIB_RULES\@/) {
|
||||||
$type = "lib";
|
$type = "lib";
|
||||||
} elsif(/^TOPOBJDIR\s*=\s*(\S+)\s*$/) {
|
} elsif(/^TOPOBJDIR\s*=\s*(\S+)\s*$/) {
|
||||||
|
@ -243,8 +233,12 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) {
|
||||||
|
|
||||||
close(IN);
|
close(IN);
|
||||||
|
|
||||||
if (!$module && $makefile_in_file eq "libs/wine/Makefile.in") {
|
if (!$module) {
|
||||||
$module = "wine.lib";
|
if ($makefile_in_file eq "libs/wine/Makefile.in") {
|
||||||
|
$module = "wine.lib";
|
||||||
|
} elsif ($makefile_in_file eq "tools/winebuild/Makefile.in") {
|
||||||
|
$module = "winebuild.exe";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
next if !$module;
|
next if !$module;
|
||||||
|
|
Loading…
Reference in a new issue