[4/4] winemaker: Programs should be linked with all the libraries in a workspace file

André Hentschel nerv at dawncrow.de
Tue Oct 9 16:24:11 CDT 2012


---
 tools/winemaker |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/tools/winemaker b/tools/winemaker
index baac85c..7cc9409 100755
--- a/tools/winemaker
+++ b/tools/winemaker
@@ -20,7 +20,7 @@ use strict;
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 #
 
-my $version="0.8.3";
+my $version="0.8.4";
 
 use Cwd;
 use File::Basename;
@@ -1219,7 +1219,18 @@ sub source_scan_workspace_file($)
         close(FILEIWS);
     }
 
-    @projects=sort { @$a[$P_PATH] cmp @$b[$P_PATH] } @projects;
+    foreach my $apptrg ($main_project[$P_SETTINGS],@{$main_project[$P_TARGETS]}) {
+        if (@$apptrg[$T_TYPE]==$TT_GUIEXE or @$apptrg[$T_TYPE]==$TT_CUIEXE) {
+            foreach my $libtrg ($main_project[$P_SETTINGS],@{$main_project[$P_TARGETS]}) {
+                if (@$libtrg[$T_TYPE]==$TT_DLL or @$libtrg[$T_TYPE]==$TT_LIB) {
+                    my $basename=@$libtrg[$T_NAME];
+                    $basename =~ s/\.(dll|a)$//i;
+                    push @{@$apptrg[$T_LIBRARY_PATH]},"-L.";
+                    push @{@$apptrg[$T_LIBRARIES]},$basename;
+                }
+            }
+        }
+    }
 }
 
 ##
-- 
1.7.4.1


-- 

Best Regards, André Hentschel


More information about the wine-patches mailing list