From 6c15647858e866d1366de57f49e52a4a2b69aa0f Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 2 Aug 2014 15:06:10 -0700 Subject: Allow cross-building 64 bit binaries for Windows This also makes sure that we package the Qt5 translations, not the Qt4 translations. There was an odd issue that somehow a 32bit search path ended up being used by win-dll which resulted in the wrong DLLs being packaged. Signed-off-by: Dirk Hohndel --- scripts/win-ldd.pl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/win-ldd.pl b/scripts/win-ldd.pl index e3aa505de..9a303d325 100644 --- a/scripts/win-ldd.pl +++ b/scripts/win-ldd.pl @@ -3,7 +3,12 @@ use strict; my %deploy; my $objdump = $ENV{objdump} ? $ENV{objdump} : "objdump"; my @searchdirs; -my @systemdirs = (qr|^c:/windows|i, qr|^c:/winnt|i, qr|^/c/windows|i, qr|^/c/winnt|); +my @systemdirs; +if ($ENV{PATH} =~ "x86_64") { + @systemdirs = (qr|^c:/windows|i, qr|^c:/winnt|i, qr|^/c/windows|i, qr|^/c/winnt|, qr|^/usr/i686|); +} else { + @systemdirs = (qr|^c:/windows|i, qr|^c:/winnt|i, qr|^/c/windows|i, qr|^/c/winnt|); +} sub addDependenciesFor($) { open OBJDUMP, "-|", $objdump, "-p", $_[0] or die; -- cgit v1.2.3-70-g09d2