diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-09-25 20:50:14 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-09-25 20:50:14 -0700 |
| commit | 28800622f00b07724b3395eacc49f1ee87b42d08 (patch) | |
| tree | c6b92ab8c7be31bfd2a3a80289761286e0b3299f | |
| parent | 84fdbefb58c744d0f851769e41f2d0e2c572c000 (diff) | |
| download | subsurface-28800622f00b07724b3395eacc49f1ee87b42d08.tar.gz | |
Minor changes to Windows build and packaging
With these changes we link statically against libusb and libdivecomputer
but don't add the .a files to our installers.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rwxr-xr-x | packaging/windows/mingw-make.sh | 2 | ||||
| -rw-r--r-- | scripts/win-ldd.pl | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/packaging/windows/mingw-make.sh b/packaging/windows/mingw-make.sh index e9a55ba3a..1c94ff963 100755 --- a/packaging/windows/mingw-make.sh +++ b/packaging/windows/mingw-make.sh @@ -29,7 +29,6 @@ if [[ $1 == "Qt5-64" ]] ; then QMAKE_MOC=/usr/x86_64-w64-mingw32/bin/qt5/moc \ QMAKE_UIC=/usr/x86_64-w64-mingw32/bin/qt5/uic \ QMAKE_RCC=/usr/x86_64-w64-mingw32/bin/qt5/rcc \ - LIBDCDEVEL=../libdivecomputer \ LIBMARBLEDEVEL=../marble \ LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api \ QMAKE_LIBDIR+=../openssl \ @@ -68,7 +67,6 @@ else mingw32-qmake-qt4 \ CROSS_PATH=/usr/i686-w64-mingw32/sys-root/mingw \ - LIBDCDEVEL=../libdivecomputer \ LIBMARBLEDEVEL=../marble \ LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api \ $BASEDIR/../../subsurface.pro diff --git a/scripts/win-ldd.pl b/scripts/win-ldd.pl index 9a303d325..7870a13e3 100644 --- a/scripts/win-ldd.pl +++ b/scripts/win-ldd.pl @@ -51,7 +51,7 @@ for (@ARGV) { next if /^-/; if (-d $_) { push @searchdirs, $_; - } elsif (-f $_) { + } elsif (-f $_ && ! /\.a$/) { # Add $_'s path to the search list too my $dirname = $_; $dirname =~ s,/[^/]+$,,; |