diff --git a/mingw64-find-requires.sh b/mingw64-find-requires.sh index 5cec7f0..af83c7f 100644 --- a/mingw64-find-requires.sh +++ b/mingw64-find-requires.sh @@ -14,51 +14,51 @@ fi filelist=`sed "s/['\"]/\\\&/g"` -dlls_to_exclude=" - advapi32.dll - cfgmgr32.dll - comctl32.dll - comdlg32.dll - crypt32.dll - ddraw.dll - dnsapi.dll - dsound.dll - gdi32.dll - gdiplus.dll - glu32.dll - glut32.dll - imm32.dll - iphlpapi.dll - kernel32.dll - mscms.dll - mscoree.dll - msimg32.dll - msvcr71.dll - msvcr80.dll - msvcr90.dll - msvcrt.dll - mswsock.dll - ole32.dll - oleaut32.dll - opengl32.dll - psapi.dll - rpcrt4.dll - secur32.dll - setupapi.dll - shell32.dll - shlwapi.dll - user32.dll - usp10.dll - version.dll - wininet.dll - winmm.dll - wldap32.dll - ws2_32.dll - wsock32.dll +libs_to_exclude=" + advapi32 + cfgmgr32 + comctl32 + comdlg32 + crypt32 + ddraw + dnsapi + dsound + gdi32 + gdiplus + glu32 + glut32 + imm32 + iphlpapi + kernel32 + mscms + mscoree + msimg32 + msvcr71 + msvcr80 + msvcr90 + msvcrt + mswsock + ole32 + oleaut32 + opengl32 + psapi + rpcrt4 + secur32 + setupapi + shell32 + shlwapi + user32 + usp10 + version + wininet + winmm + wldap32 + ws2_32 + wsock32 " exclude_pattern="" -for i in $dlls_to_exclude; do +for i in $libs_to_exclude; do if test "$exclude_pattern" == ""; then exclude_pattern=$i; else @@ -82,7 +82,7 @@ done | sort -u for g in $pcs; do dirname=`dirname $g` PKG_CONFIG_PATH=$dirname x86_64-w64-mingw32-pkg-config --print-errors --print-requires $g | awk '{ print "mingw64(pkg:"$1")", $2, $3 }' - PKG_CONFIG_PATH=$dirname x86_64-w64-mingw32-pkg-config --print-errors --print-requires-private $g | awk '{ print "mingw64(pkg:"$1")", $2, $3 }' + PKG_CONFIG_PATH=$dirname x86_64-w64-mingw32-pkg-config --print-errors --print-requires-private $g | grep -Ev "$exclude_pattern" | awk '{ print "mingw64(pkg:"$1")", $2, $3 }' for h in `PKG_CONFIG_PATH=$dirname x86_64-w64-mingw32-pkg-config --libs-only-l $g | sed 's#\-l##g'`; do echo "mingw64(lib:$h)" done @@ -91,7 +91,7 @@ for k in $configs; do for j in `PKG_CONFIG=x86_64-w64-mingw32-pkg-config $k --libs`; do case $j in -l*) - echo $j | sed 's#\-l##g' | awk '{ print "mingw64(lib:"$1")" }' + echo $j | sed 's#\-l##g' | grep -Ev "$exclude_pattern" | awk '{ print "mingw64(lib:"$1")" }' ;; *) ;;