From: Thomas Debesse <dev@illwieckz.net>
Date: Mon, 17 Jun 2019 22:15:11 +0000 (+0200)
Subject: bundle: use ntldd on msys2 instead of ldd to enable 32bit build on 64bit os
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=7f75ce55839e0b2adde66810341d8dd33869cefb;p=xonotic%2Fnetradiant.git

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

diff --git a/README.md b/README.md
index 8ffb05e5..83a7f6c7 100644
--- 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 b776c532..ca95ae00 100644
--- 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}")"