Winemaker: improved MSVCRT support

[Martin Wilck]

Patch: winemaker-msvrct.diff

Martin Wilck <Martin.Wilck at fujitsu-siemens.com>
Patch against: CVS 2002-09-13 with my "winemaker-fixes" patch
(http://www.winehq.com/hypermail/wine-patches/2002/09/0091.html)

Comment: Please apply that one, it really fixes bugs!
	This one is rather for convenience.

Modified files:
        - tools:        winemaker

Log message:
        - support "-imsvcrt" as an abbreviation of "-imsvcrt.dll"
        - automatically add MSVCRT include path if MSVCRT DLL was requested.

--- CVS/wine/tools/winemaker	Fri Sep 13 12:43:19 2002
+++ TMP/wine/tools/winemaker	Fri Sep 13 12:38:35 2002
@@ -439,7 +439,14 @@
     } elsif ($option =~ /^-P/) {
       push @{@$target[$T_DLL_PATH]},"-L$'";
     } elsif ($option =~ /^-i/) {
-      push @{@$target[$T_DLLS]},"$'";
+      my $dllname = $';
+      if ($dllname =~ /^[^.]*$/) {
+        $dllname .= ".dll";
+      }
+      if ($dllname =~ /^msvcrt\.dll$/) {
+        push @{@$target[$T_INCLUDE_PATH]},"-I\$(WINE_INCLUDE_ROOT)/msvcrt";
+      }
+      push @{@$target[$T_DLLS]},$dllname;
     } elsif ($option =~ /^-L/) {
       push @{@$target[$T_LIBRARY_PATH]},$option;
     } elsif ($option =~ /^-l/) {
@@ -2232,7 +2239,14 @@
   } elsif ($arg =~ /^-P/) {
     push @{$global_settings[$T_DLL_PATH]},"-L$'";
   } elsif ($arg =~ /^-i/) {
-    push @{$global_settings[$T_DLLS]},$';
+    my $dllname = $';
+    if ($dllname =~ /^[^.]*$/) {
+      $dllname .= ".dll";
+    }
+    if ($dllname =~ /^msvcrt\.dll$/) {
+      push @{$global_settings[$T_INCLUDE_PATH]},"-I\$(WINE_INCLUDE_ROOT)/msvcrt";
+    }
+    push @{$global_settings[$T_DLLS]},$dllname;
   } elsif ($arg =~ /^-L/) {
     push @{$global_settings[$T_LIBRARY_PATH]},$arg;
   } elsif ($arg =~ /^-l/) {
-- 
Martin Wilck                Phone: +49 5251 8 15113
Fujitsu Siemens Computers   Fax:   +49 5251 8 20409
Heinz-Nixdorf-Ring 1	    mailto:Martin.Wilck at Fujitsu-Siemens.com
D-33106 Paderborn           http://www.fujitsu-siemens.com/primergy