msvcmaker: "MODULE = none" is obsolete

[André Hentschel]

Fix for http://bugs.winehq.org/show_bug.cgi?id=29577
(the .ocx problem still exists, needs another patch)
---
 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;
-- 

Best Regards, André Hentschel
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: Nachrichtenteil als Anhang
URL: <http://www.winehq.org/pipermail/wine-patches/attachments/20120205/4506bb82/attachment.ksh>