Rolf Kalbermatter : winapi: msvcmaker adaption to new directory
structure.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Jan 6 06:16:55 CST 2006
Module: wine
Branch: refs/heads/master
Commit: b7142fbb866724b059b17307588d25b31c491aa0
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b7142fbb866724b059b17307588d25b31c491aa0
Author: Rolf Kalbermatter <rolf.kalbermatter at citeng.com>
Date: Fri Jan 6 12:19:11 2006 +0100
winapi: msvcmaker adaption to new directory structure.
Fix some issues with MSVC project file generation after recent
directory restructuring.
---
tools/winapi/msvcmaker | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker
index 1d31ae0..53c37fb 100755
--- a/tools/winapi/msvcmaker
+++ b/tools/winapi/msvcmaker
@@ -72,7 +72,7 @@ sub read_spec_file($) {
close(IN);
# FIXME: Kludge
- if($module =~ /^(?:(?:imm|ole2conv|ole2prox|ole2thk|rasapi16|windebug)\.dll|comm\.drv)$/) {
+ if($module =~ /^(?:(?:imm|ole2conv|ole2prox|ole2thk|rasapi16|msacm|windebug)\.dll|comm\.drv)$/) {
$type = "win16";
}
@@ -91,6 +91,8 @@ if ($options->wine || $options->winetest
my @gdi32_dirs = qw(dlls/gdi/enhmfdrv dlls/gdi/mfdrv);
+push @makefile_in_files, "libs/wine/Makefile.in";
+push @makefile_in_files, "libs/unicode/Makefile.in";
push @makefile_in_files, "tools/winebuild/Makefile.in";
sub filter_files($$) {
@@ -124,6 +126,11 @@ MAKEFILE_IN: foreach my $makefile_in_fil
my $again = 0;
my $lookahead = 0;
+
+ if($makefile_in_file eq "loader/Makefile.in") {
+ next;
+ }
+
while($again || defined(my $line = <IN>)) {
if(!$again) {
chomp $line;
@@ -150,16 +157,14 @@ MAKEFILE_IN: foreach my $makefile_in_fil
$module = $1;
if($module eq "none") {
- if($makefile_in_file eq "library/Makefile.in") {
- $module = "wine.dll";
- } elsif($makefile_in_file eq "unicode/Makefile.in") {
- $module = "wine_unicode.dll";
- } elsif($makefile_in_file eq "tools/winebuild/Makefile.in") {
+ if($makefile_in_file eq "tools/winebuild/Makefile.in") {
$module = "winebuild.exe";
} else {
next MAKEFILE_IN;
}
}
+ } elsif(/^LIBRARY\s*=\s*(\S+)\s*$/) {
+ $module = $1 . "\.lib";
} elsif(/^TOPOBJDIR\s*=\s*(\S+)\s*$/) {
$topobjdir = $1;
} elsif (/^TESTDLL\s*=\s*(\S+)\s*$/) {
@@ -747,10 +752,10 @@ sub _generate_dsp($$) {
if ($project eq "winebuild") {
print OUT "# Begin Special Build Tool\r\n";
print OUT "SOURCE=\"\$(InputPath)\"\r\n";
- print OUT "PostBuild_Desc=Copying wine.dll and wine_unicode.dll ...\r\n";
+ print OUT "PostBuild_Desc=Copying wine.lib and wine_unicode.lib ...\r\n";
print OUT "PostBuild_Cmds=";
- print OUT "copy ..\\..\\library\\$output_dir\\wine.dll \$(OutDir)\t";
- print OUT "copy ..\\..\\unicode\\$output_dir\\wine_unicode.dll \$(OutDir)\r\n";
+ 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 "# End Special Build Tool\r\n";
}
print OUT "# Begin Target\r\n";
More information about the wine-cvs
mailing list