diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-08-02 15:06:10 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-08-02 15:08:22 -0700 |
| commit | 6c15647858e866d1366de57f49e52a4a2b69aa0f (patch) | |
| tree | e2f4a7829d2f1556c40b4c1294ed73bfd625e754 /scripts/win-ldd.pl | |
| parent | a104905257876b8b25c5ff06f1fc41f8f87ee34f (diff) | |
| download | subsurface-6c15647858e866d1366de57f49e52a4a2b69aa0f.tar.gz | |
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 <dirk@hohndel.org>
Diffstat (limited to 'scripts/win-ldd.pl')
| -rw-r--r-- | scripts/win-ldd.pl | 7 |
1 files changed, 6 insertions, 1 deletions
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; |