diff scripts/win32/deploy_build.sh @ 343:1faa72660932

*: transfer back to cmake from autotools autotools just made lots of things more complicated than they should have and many things broke (i.e. translations)
author Paper <paper@paper.us.eu.org>
date Thu, 20 Jun 2024 05:56:06 -0400
parents 8eb0cfe59992
children
line wrap: on
line diff
--- a/scripts/win32/deploy_build.sh	Thu Jun 20 03:03:05 2024 -0400
+++ b/scripts/win32/deploy_build.sh	Thu Jun 20 05:56:06 2024 -0400
@@ -17,16 +17,12 @@
 	# do not run this on untrusted executables.
 	# see: ldd(1)
 	system="$(echo "$MSYSTEM" | tr "[:upper:]" "[:lower:]")"
-	"$LDD" --output-format ldd-like --dll-lookup-dirs "/$system/bin" -- "$1" | while IFS="" read -r dependency; do
+	"$LDD" --output-format ldd-like --dll-lookup-dirs "/$system/bin" "$PWD" -- "$1" | while IFS="" read -r dependency; do
 		# trim whitespace, then get the value; mingw-ldd's "ldd-like" output doesn't use tabs like regular ldd
 		lib="$(printf -- "%s" "$dependency" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' | cut -d' ' -f3)"
-		case $lib in
-			"/$system/"*)
-				printf -- "$lib\n"
-				;;
-			*)
-				;;
-		esac
+		if test "x$lib" != "xnot"; then
+			printf -- "$lib\n"
+		fi
 	done
 }
 
@@ -37,12 +33,12 @@
 
 mkdir "$DIR"
 
-for lib in $(GetNeededLibraries ".libs/minori.exe"); do
+for lib in $(GetNeededLibraries "minori.exe"); do
 	echo "copying '$lib' to $DIR"
 	cp "$lib" "$DIR/"
 done
 
-cp ".libs/minori.exe" "$DIR/"
+cp "minori.exe" "$DIR/"
 
 windeployqt "$DIR/minori.exe"