reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-29 06:30:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed a number of references to removed directories.

Browse Source
This commit is contained in:
Alexandre Julliard 2005-06-09 10:24:51 +00:00
parent 075f98e2f1
commit dae2b44263
3 changed files with 5 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/winapi/config.pm
View File

@ -83,10 +83,9 @@ sub file_type($) {
$_ = file_absolutize($_);
m%^(?:libtest|rc|server|tests|tools)/% && return "";
m%^(?:programs|debugger|miscemu)/% && return "wineapp";
m%^(?:server|tests|tools)/% && return "";
m%^(?:programs)/% && return "wineapp";
m%^(?:libs)/% && return "library";
m%^windows/x11drv/wineclipsrv\.c$% && return "application";
return "winelib";
}

84
tools/winapi/msvcmaker
View File

@ -90,8 +90,6 @@ if ($options->wine || $options->winetest) {
}
my @gdi32_dirs = qw(dlls/gdi/enhmfdrv dlls/gdi/mfdrv);
my @ntdll_dirs = qw(misc);
my @user32_dirs = qw(dlls/user/dde windows);
push @makefile_in_files, "tools/winebuild/Makefile.in";
@ -264,61 +262,6 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) {
($header_files, my $local_header_files) = filter_files($header_files, "$dir2/");
($resource_files, my $local_resource_files) = filter_files($resource_files, "$dir2/");
$modules{$module}{wine} = 1;
$modules{$module}{winetest} = 0;
$modules{$module}{project} = $project;
$modules{$module}{type} = $type;
$modules{$module}{dsp_file} = $dsp_file;
$modules{$module}{c_srcs} = $c_srcs;
$modules{$module}{source_files} = $local_source_files;
$modules{$module}{header_files} = $local_header_files;
$modules{$module}{resource_files} = $local_resource_files;
$modules{$module}{imports} = [];
}
} elsif($module eq "ntdll.dll") {
foreach my $dir (@ntdll_dirs) {
my $module = "ntdll_$dir.lib";
$module =~ s%/%_%g;
my $project = "ntdll_$dir";
$project =~ s%/%_%g;
my $type = "lib";
my $dsp_file = "$dir/$project.dsp";
($source_files, my $local_source_files) = filter_files($source_files, "/$dir/");
($header_files, my $local_header_files) = filter_files($header_files, "/$dir/");
($resource_files, my $local_resource_files) = filter_files($resource_files, "/$dir/");
$modules{$module}{wine} = 1;
$modules{$module}{winetest} = 0;
$modules{$module}{project} = $project;
$modules{$module}{type} = $type;
$modules{$module}{dsp_file} = $dsp_file;
$modules{$module}{c_srcs} = $c_srcs;
$modules{$module}{source_files} = $local_source_files;
$modules{$module}{header_files} = $local_header_files;
$modules{$module}{resource_files} = $local_resource_files;
$modules{$module}{imports} = [];
}
} elsif($module eq "user32.dll") {
foreach my $dir (@user32_dirs) {
my $dir2 = $dir;
$dir2 =~ s%^.*?/([^/]+)$%$1%;
my $module = "user32_$dir2.lib";
$module =~ s%/%_%g;
my $project = "user32_$dir2";
$project =~ s%/%_%g;
my $type = "lib";
my $dsp_file = "$dir/$project.dsp";
($source_files, my $local_source_files) = filter_files($source_files, "$dir2/");
($header_files, my $local_header_files) = filter_files($header_files, "$dir2/");
($resource_files, my $local_resource_files) = filter_files($resource_files, "$dir2/");
$modules{$module}{wine} = 1;
$modules{$module}{winetest} = 0;
$modules{$module}{project} = $project;
@ -479,7 +422,7 @@ sub _generate_dsp($$) {
my @resource_files = @{$modules{$module}{resource_files}};
if ($project !~ /^wine(?:_unicode|build|runtests|test)?$/ &&
$project !~ /^(?:gdi32|ntdll|user32)_.+?$/ &&
$project !~ /^(?:gdi32)_.+?$/ &&
$project !~ /_test$/)
{
push @source_files, "$project.spec";
@ -688,14 +631,6 @@ sub _generate_dsp($$) {
push @includes, "..";
}
if($project eq "user32_windows") {
push @includes, "..\\dlls\\user";
}
if($project eq "user32_dde") {
push @includes, "..";
}
if ($project =~ /_test$/) {
push @includes, "$msvc_wine_dir\\$output_dir";
}
@ -1048,7 +983,7 @@ sub _generate_wine_dsw($) {
@dependencies = ();
} elsif($project =~ /^winebuild$/) {
@dependencies = ("wine", "wine_unicode");
} elsif($project =~ /^(?:gdi32|ntdll|user32)_.+?$/) {
} elsif($project =~ /^(?:gdi32)_.+?$/) {
@dependencies = ();
} else {
@dependencies = ("wine", "wine_unicode", "winebuild");
@ -1063,21 +998,6 @@ sub _generate_wine_dsw($) {
$module =~ s%/%_%g;
push @dependencies, $module;
}
} elsif($project =~ /^ntdll$/) {
foreach my $dir (@ntdll_dirs) {
my $module = "ntdll_$dir";
$module =~ s%/%_%g;
push @dependencies, $module;
}
} elsif($project =~ /^user32$/) {
foreach my $dir (@user32_dirs) {
my $dir2 = $dir;
$dir2 =~ s%^.*?/([^/]+)$%$1%;
my $module = "user32_$dir2";
$module =~ s%/%_%g;
push @dependencies, $module;
}
}
_generate_dsw_project(\*OUT, $project, $dsp_file, \@dependencies);

4
tools/winapi/winapi_cleanup
View File

@ -127,9 +127,7 @@ sub cleanup_file($$$) {
if ($options->include_quotes) {
my $module = "";
if ($dir =~ m%^$wine_dir/(?:windows)$%) {
$module = "user";
} elsif ($dir =~ m%^$wine_dir/dlls/(.*?)/.*?$%) {
if ($dir =~ m%^$wine_dir/dlls/(.*?)/.*?$%) {
$module = $1;
}