=?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: msvcmaker: "MODULE = none" is obsolete.

Alexandre Julliard julliard at winehq.org
Mon Feb 6 15:17:57 CST 2012


Module: wine
Branch: master
Commit: dbbf8f8adea988e4d52b42f9604d324c03a00a6f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=dbbf8f8adea988e4d52b42f9604d324c03a00a6f

Author: André Hentschel <nerv at dawncrow.de>
Date:   Sun Feb  5 14:52:10 2012 +0100

msvcmaker: "MODULE = none" is obsolete.

---

 tools/winapi/msvcmaker |   18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker
index d03ce3f..0c82420 100755
--- a/tools/winapi/msvcmaker
+++ b/tools/winapi/msvcmaker
@@ -180,16 +180,6 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) {
 
 	if(/^MODULE\s*=\s*([\w\.]+)$/) {
 	    $module = $1;
-
-	    if($module eq "none") {
-		if($makefile_in_file eq "tools/winebuild/Makefile.in") {
-		    $module = "winebuild.exe";
-		} elsif ($makefile_in_file eq "include/Makefile.in") {
-		    $module = "include.lib";
-		} else {
-		    next MAKEFILE_IN;
-		}
-	    }
 	} elsif (/^\@MAKE_IMPLIB_RULES\@/) {
 	    $type = "lib";
 	} elsif(/^TOPOBJDIR\s*=\s*(\S+)\s*$/) {
@@ -243,8 +233,12 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) {
 
     close(IN);
 
-    if (!$module && $makefile_in_file eq "libs/wine/Makefile.in") {
-	$module = "wine.lib";
+    if (!$module) {
+        if ($makefile_in_file eq "libs/wine/Makefile.in") {
+            $module = "wine.lib";
+        } elsif ($makefile_in_file eq "tools/winebuild/Makefile.in") {
+            $module = "winebuild.exe";
+        }
     }
 
     next if !$module;




More information about the wine-cvs mailing list