diff options
| -rw-r--r-- | scripts/win-ldd.pl | 2 | ||||
| -rw-r--r-- | subsurface-install.pri | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/win-ldd.pl b/scripts/win-ldd.pl index 8af449a7b..6ca97b74a 100644 --- a/scripts/win-ldd.pl +++ b/scripts/win-ldd.pl @@ -2,7 +2,7 @@ use strict; my %deploy; my $objdump = $ENV{objdump} ? $ENV{objdump} : "i686-w64-mingw32-objdump"; -my @searchdirs; +my @searchdirs = split(/:/, $ENV{PATH}); sub addDependenciesFor($) { open OBJDUMP, "-|", $objdump, "-p", $_[0] or die; diff --git a/subsurface-install.pri b/subsurface-install.pri index 37c8e077f..c71ae0ada 100644 --- a/subsurface-install.pri +++ b/subsurface-install.pri @@ -51,8 +51,8 @@ mac { !win32-msvc* { #!equals($$QMAKE_HOST.os, "Windows"): dlls.commands += OBJDUMP=`$(CC) -dumpmachine`-objdump + dlls.commands += PATH=\$\$PATH:`$(CC) -print-search-dirs | $(SED) -nE \'/^libraries: =/{s///;s,/lib/?(:|\\\$\$),/bin\\1,g;p;q;}\'` dlls.commands += perl $$PWD/scripts/win-ldd.pl $(DESTDIR_TARGET) - dlls.commands += `$(CC) -print-search-dirs | $(SED) -n \'/^libraries: =/{s///;s/:/\\n/g;p;q;}\' | $(SED) -E \'s,/lib/?\\\$\$,/bin,\'` dlls.commands += $$LIBS dlls.commands += | while read name; do $(INSTALL_FILE) \$\$name $$PWD/$$WINDOWSSTAGING; done dlls.depends = $(DESTDIR_TARGET) |