[mingw-nsiswrapper: 5/20] Add more system library to nsiswrapper (René Berber)

[Kalev Lember]

commit a98dd2f8c3e1c86a127d7b185b71c6e0c339be82
Author: Richard W.M. Jones <rjones at fedoraproject.org>
Date:   Tue Jun 9 08:50:41 2009 +0000

    Add more system library to nsiswrapper (René Berber)

 nsiswrapper.pl |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/nsiswrapper.pl b/nsiswrapper.pl
index 1bd6122..a303934 100755
--- a/nsiswrapper.pl
+++ b/nsiswrapper.pl
@@ -443,7 +443,7 @@ sub get_deps_for_file
     if (m/\.exe$/i || m/\.dll$/i) {
 	my $cmd = "$objdump -p '$file' |
                    grep 'DLL Name:' |
-                   grep -Eo '[-._\+[:alnum:]]+\.dll' |
+                   grep -Eio '[-._\+[:alnum:]]+\.dll' |
                    sort -u"; # XXX quoting
 	open DEPS, "$cmd |" or die "$cmd: $!";
 	foreach (<DEPS>) {
@@ -493,7 +493,19 @@ sub is_windows_system_dll
 	$_ eq 'ole32.dll' ||
 	$_ eq 'mscoree.dll' ||
 	$_ eq 'msvcrt.dll' ||
-	$_ eq 'user32.dll'
+	$_ eq 'user32.dll' ||
+	$_ eq 'advapi32.dll' ||
+	$_ eq 'comctl32.dll' ||
+	$_ eq 'comdlg32.dll' ||
+	$_ eq 'imm32.dll' ||
+	$_ eq 'msimg32.dll' ||
+	$_ eq 'oleaut32.dll' ||
+	$_ eq 'shell32.dll' ||
+	$_ eq 'shlwapi.dll' ||
+	$_ eq 'winmm.dll' ||
+	$_ eq 'wsock32.dll' ||
+	$_ eq 'ws2_32.dll' ||
+	$_ eq 'wldap32.dll'
 }
 
 # Add Gtk dependencies, if --with-gtk.