mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-06 07:37:09 +00:00
tools: Relax the dot in module names rules.
This should allow modules with dot in their names, while still making the .dll extension optional. The MODULE variable still determines the actual output file extension. Signed-off-by: Rémi Bernon <rbernon@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
7eb77bef05
commit
a6f214d75a
|
@ -446,18 +446,17 @@ sub update_makefiles(@)
|
|||
if (defined $make{"APPMODE"}) { $dllflags .= " " . $make{"APPMODE"}; }
|
||||
die "MODULE should not be defined in $file" unless $file =~ /^(dlls|programs)\//;
|
||||
die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"};
|
||||
die "Invalid MODULE in $file" if $name =~ /\./ && $make{"MODULE"} ne $name;
|
||||
if ($file =~ /^programs\//)
|
||||
{
|
||||
die "EXTRADLLFLAGS should be defined in $file" unless $dllflags;
|
||||
die "EXTRADLLFLAGS should contain -mconsole or -mwindows in $file" unless $dllflags =~ /-m(console|windows)/;
|
||||
die "Invalid MODULE in $file" unless $name =~ /\./ || $make{"MODULE"} eq "$name.exe";
|
||||
die "Invalid MODULE in $file" unless ($name =~ /\./ && $make{"MODULE"} eq $name) || $make{"MODULE"} eq "$name.exe";
|
||||
}
|
||||
else
|
||||
{
|
||||
die "APPMODE should not be defined in $file" if defined $make{"APPMODE"} ;
|
||||
die "EXTRADLLFLAGS should not contain -mconsole or -mwindows in $file" if $dllflags =~ /-m(console|windows)/;
|
||||
die "Invalid MODULE in $file" unless $name =~ /\./ || $make{"MODULE"} eq "$name.dll";
|
||||
die "Invalid MODULE in $file" unless ($name =~ /\./ && $make{"MODULE"} eq $name) || $make{"MODULE"} eq "$name.dll";
|
||||
}
|
||||
if (defined $make{"IMPORTLIB"})
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue