Fix for winemaker -i

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Patch: winemaker-minus-i.diff
Log Message:
        Martin Wilck (martin.wilck@fujitsu-siemens.com):
        Fix -i option for winebuild linking
        (like in Jeff Smith's patch http://cvs.winehq.com/patch.py?id=6654)

--- wine/tools/winemaker.orig	Tue Jun 24 11:42:54 2003
+++ wine/tools/winemaker	Tue Aug  5 11:32:03 2003
@@ -440,10 +440,7 @@
       push @{@$target[$T_DLL_PATH]},"-L$'";
     } elsif ($option =~ /^-i/) {
       my $dllname = $';
-      if ($dllname =~ /^[^.]*$/) {
-        $dllname .= ".dll";
-      }
-      if ($dllname =~ /^msvcrt\.dll$/) {
+      if ($dllname =~ /^msvcrt$/) {
         push @{@$target[$T_INCLUDE_PATH]},"-I\$(WINE_INCLUDE_ROOT)/msvcrt";
       }
       push @{@$target[$T_DLLS]},$dllname;
@@ -2213,10 +2210,7 @@
     push @{$global_settings[$T_DLL_PATH]},"-L$'";
   } elsif ($arg =~ /^-i/) {
     my $dllname = $';
-    if ($dllname =~ /^[^.]*$/) {
-      $dllname .= ".dll";
-    }
-    if ($dllname =~ /^msvcrt\.dll$/) {
+    if ($dllname =~ /^msvcrt$/) {
       push @{$global_settings[$T_INCLUDE_PATH]},"-I\$(WINE_INCLUDE_ROOT)/msvcrt";
     }
     push @{$global_settings[$T_DLLS]},$dllname;
-- 
Martin Wilck                Phone: +49 5251 8 15113
Fujitsu Siemens Computers   Fax:   +49 5251 8 20409
Heinz-Nixdorf-Ring 1	    mailto:Martin.Wilck@Fujitsu-Siemens.com
D-33106 Paderborn           http://www.fujitsu-siemens.com/primergy







[Index of Archives]     [Gimp for Windows]     [Red Hat]     [Samba]     [Yosemite Camping]     [Graphics Cards]     [Wine Home]

  Powered by Linux