Add support for static libraries

Francois Gouget fgouget at free.fr
Thu Sep 30 19:22:52 CDT 2004


msvcmaker used to ignore EXTRALIBS and thus missed the static libraries
such as uuid, dxerr8, etc. With this patch I can regenerate the tests
project files and they work right out of the box on Windows.


Changelog:

 * tools/winapi/msvcmaker

   Handle the static libraries linked to using EXTRALIBS.


-- 
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
                     Avoid the Gates of Hell - use Linux.
-------------- next part --------------
Index: tools/winapi/msvcmaker
===================================================================
RCS file: /var/cvs/wine/tools/winapi/msvcmaker,v
retrieving revision 1.27
diff -u -r1.27 msvcmaker
--- tools/winapi/msvcmaker	23 Sep 2004 04:26:54 -0000	1.27
+++ tools/winapi/msvcmaker	30 Sep 2004 12:04:51 -0000
@@ -165,8 +165,9 @@
 	} elsif (/^TESTDLL\s*=\s*(\S+)\s*$/) {
 	    $testdll = $1;
 	} elsif (/^IMPORTS\s*=\s*/) {
-	    @imports = split /\s+/s, $';
-	    @imports = grep !/^ntdll$/, @imports;
+            push @imports, grep !/^ntdll$/, split /\s+/s, $';
+	} elsif (/^EXTRALIBS\s*=\s*/) {
+            push @imports, map { /^-l(dxerr8|dxerr9|dxguid|strmiids|uuid)$/ ? $1 : () } split /\s+/s, $';
 	} elsif (/^CTESTS\s*=\s*/) {
 	    my @files = split /\s+/s, $';
 


More information about the wine-patches mailing list