my @header_files = @{$modules{$module}{header_files}};
my @resource_files = @{$modules{$module}{resource_files}};
- if ($project !~ /^wine(?:_unicode|build|runtests|test)?$/ &&
+ if ($project !~ /^wine(?:build|runtests|test)?$/ &&
$project !~ /^(?:gdi32)_.+?$/ &&
$project !~ /_test$/)
{
push @source_files, "$project.spec";
- # push @source_files, "$project.spec.c";
@source_files = sort(@source_files);
}
print OUT "# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od";
@defines = (qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 _DEBUG _MBCS _LIB));
} else {
- print OUT "# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od";
+ print OUT "# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od";
@defines = (qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 _DEBUG _WINDOWS _MBCS _USRDLL), ("\U${project}\E_EXPORTS"));
}
} else {
print OUT "# ADD BASE CPP /nologo /W3 /GX /O2";
@defines = (qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 NDEBUG _MBCS _LIB));
} else {
- print OUT "# ADD BASE CPP /nologo /MT /W3 /GX /O2";
+ print OUT "# ADD BASE CPP /nologo /MD /W3 /GX /O2";
@defines = (qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 NDEBUG _WINDOWS _MBCS _USRDLL), ("\U${project}\E_EXPORTS"));
}
}
my @defines2;
if($debug) {
if($lib) {
- print OUT "# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od";
+ print OUT "# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od";
@defines2 = qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 _DEBUG _WINDOWS _MBCS _LIB);
} else {
- print OUT "# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od";
+ print OUT "# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od";
@defines2 = qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 _DEBUG WIN32 _WINDOWS _MBCS _USRDLL);
}
} else {
if($lib) {
- print OUT "# ADD CPP /nologo /MT /W3 /GX /O2";
+ print OUT "# ADD CPP /nologo /MD /W3 /GX /O2";
@defines2 = qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 NDEBUG _WINDOWS _MBCS _LIB);
} else {
- print OUT "# ADD CPP /nologo /MT /W3 /GX /O2";
+ print OUT "# ADD CPP /nologo /MD /W3 /GX /O2";
@defines2 = qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 NDEBUG WIN32 _WINDOWS _MBCS _USRDLL);
}
}
if ($project eq "winebuild") {
print OUT "# Begin Special Build Tool\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 "copy ..\\..\\libs\\wine\\$output_dir\\wine.lib \$(OutDir)\t";
- print OUT "copy ..\\..\\libs\\unicode\\$output_dir\\wine_unicode.lib \$(OutDir)\r\n";
+ print OUT "copy ..\\..\\libs\\wine\\$output_dir\\wine.lib \$(OutDir)\r\n";
print OUT "# End Special Build Tool\r\n";
}
print OUT "# Begin Target\r\n";
my $dsp_file = $modules{$module}{dsp_file};
my @dependencies;
- if($project =~ /^wine(?:_unicode)?$/) {
+ if($project eq "wine") {
@dependencies = ();
- } elsif($project =~ /^winebuild$/) {
- @dependencies = ("wine", "wine_unicode");
+ } elsif($project eq "winebuild") {
+ @dependencies = ("wine");
} elsif($project =~ /^(?:gdi32)_.+?$/) {
@dependencies = ();
} else {
- @dependencies = ("wine", "wine_unicode", "winebuild");
+ @dependencies = ("wine", "winebuild");
}
if($project =~ /^gdi32$/) {
print OUT "/* Automatically generated file; DO NOT EDIT!! */\n\n";
print OUT "/* Force the linker to generate a .lib file */\n";
- print OUT "void __wine_dummy_lib_function()\n{\n}\n\n";
+ print OUT "void __wine_dummy_lib_function(void)\n{\n}\n\n";
}
if ($options->wine) {