bundle: use ntldd on msys2 instead of ldd to enable 32bit build on 64bit os

diff --git a/README.md b/README.md
index 8ffb05e5ab91a191b72f87705baf1d546e831cbe..83a7f6c788c540d64c6eae71324a673633a5d47c 100644 (file)
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ Install the dependencies this way:
 
 
 ```
-pacman -S --needed base-devel mingw-w64-$(uname -m)-{toolchain,cmake,make,gtk2,gtkglext,libwebp,minizip-git} git
+pacman -S --needed base-devel mingw-w64-$(uname -m)-{ntldd-git,toolchain,cmake,make,gtk2,gtkglext,libwebp,minizip-git} git
 ```
 
 Explicitely use `mingw-w64-x86_64-` or `mingw-w64-i686-` prefix if you need to target a non-default architecture.

diff --git a/library-bundler b/library-bundler
index b776c53297cea51163d358cc5511975b7287ceb3..ca95ae00863d86b2e42141b310979fee8a46bb24 100644 (file)
--- a/library-bundler
+++ b/library-bundler
@@ -8,9 +8,10 @@ case "${system_name}" in
        'windows')
                bundle_dir="$(cygpath --unix "${bundle_dir}")"
                exe_file="$(cygpath --unix "${exe_file}")"
-               ldd "${exe_file}" \
-               | egrep -i '\.dll => /mingw64/' \
+               ntldd --recursive "${exe_file}" \
+               | egrep -i '\.dll => [A-Z]:\\msys64\\' \
                | sed -e 's/ (0x[0-9a-f]*)$//;s/^.* => //' \
+               | cygpath --unix --file - \
                | while read dll_file
                do
                        dll_basename="$(basename "${dll_file}")"