Commit d60b99bd authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard

msvcmaker: Remove references to wine_unicode and to .spec.c files.

parent 7a576634
...@@ -425,12 +425,11 @@ sub _generate_dsp($$) { ...@@ -425,12 +425,11 @@ sub _generate_dsp($$) {
my @header_files = @{$modules{$module}{header_files}}; my @header_files = @{$modules{$module}{header_files}};
my @resource_files = @{$modules{$module}{resource_files}}; my @resource_files = @{$modules{$module}{resource_files}};
if ($project !~ /^wine(?:_unicode|build|runtests|test)?$/ && if ($project !~ /^wine(?:build|runtests|test)?$/ &&
$project !~ /^(?:gdi32)_.+?$/ && $project !~ /^(?:gdi32)_.+?$/ &&
$project !~ /_test$/) $project !~ /_test$/)
{ {
push @source_files, "$project.spec"; push @source_files, "$project.spec";
# push @source_files, "$project.spec.c";
@source_files = sort(@source_files); @source_files = sort(@source_files);
} }
...@@ -746,10 +745,9 @@ sub _generate_dsp($$) { ...@@ -746,10 +745,9 @@ sub _generate_dsp($$) {
if ($project eq "winebuild") { if ($project eq "winebuild") {
print OUT "# Begin Special Build Tool\r\n"; print OUT "# Begin Special Build Tool\r\n";
print OUT "SOURCE=\"\$(InputPath)\"\r\n"; print OUT "SOURCE=\"\$(InputPath)\"\r\n";
print OUT "PostBuild_Desc=Copying wine.lib and wine_unicode.lib ...\r\n"; print OUT "PostBuild_Desc=Copying wine.lib ...\r\n";
print OUT "PostBuild_Cmds="; print OUT "PostBuild_Cmds=";
print OUT "copy ..\\..\\libs\\wine\\$output_dir\\wine.lib \$(OutDir)\t"; print OUT "copy ..\\..\\libs\\wine\\$output_dir\\wine.lib \$(OutDir)\r\n";
print OUT "copy ..\\..\\libs\\unicode\\$output_dir\\wine_unicode.lib \$(OutDir)\r\n";
print OUT "# End Special Build Tool\r\n"; print OUT "# End Special Build Tool\r\n";
} }
print OUT "# Begin Target\r\n"; print OUT "# Begin Target\r\n";
...@@ -978,14 +976,14 @@ sub _generate_wine_dsw($) { ...@@ -978,14 +976,14 @@ sub _generate_wine_dsw($) {
my $dsp_file = $modules{$module}{dsp_file}; my $dsp_file = $modules{$module}{dsp_file};
my @dependencies; my @dependencies;
if($project =~ /^wine(?:_unicode)?$/) { if($project eq "wine") {
@dependencies = (); @dependencies = ();
} elsif($project =~ /^winebuild$/) { } elsif($project eq "winebuild") {
@dependencies = ("wine", "wine_unicode"); @dependencies = ("wine");
} elsif($project =~ /^(?:gdi32)_.+?$/) { } elsif($project =~ /^(?:gdi32)_.+?$/) {
@dependencies = (); @dependencies = ();
} else { } else {
@dependencies = ("wine", "wine_unicode", "winebuild"); @dependencies = ("wine", "winebuild");
} }
if($project =~ /^gdi32$/) { if($project =~ /^gdi32$/) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment