mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Minor changes to Windows build and packaging

Browse source 
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>
This commit is contained in:
Dirk Hohndel 2014-09-25 20:50:14 -07:00
parent 84fdbefb58
commit 28800622f0
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packaging/windows/mingw-make.sh
View file

@ -29,7 +29,6 @@ if [[ $1 == "Qt5-64" ]] ; then
QMAKE_MOC=/usr/x86_64-w64-mingw32/bin/qt5/moc \ QMAKE_MOC=/usr/x86_64-w64-mingw32/bin/qt5/moc \
QMAKE_UIC=/usr/x86_64-w64-mingw32/bin/qt5/uic \ QMAKE_UIC=/usr/x86_64-w64-mingw32/bin/qt5/uic \
QMAKE_RCC=/usr/x86_64-w64-mingw32/bin/qt5/rcc \ QMAKE_RCC=/usr/x86_64-w64-mingw32/bin/qt5/rcc \
LIBDCDEVEL=../libdivecomputer \
LIBMARBLEDEVEL=../marble \ LIBMARBLEDEVEL=../marble \
LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api \ LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api \
QMAKE_LIBDIR+=../openssl \ QMAKE_LIBDIR+=../openssl \
@ -68,7 +67,6 @@ else
mingw32-qmake-qt4 \ mingw32-qmake-qt4 \
CROSS_PATH=/usr/i686-w64-mingw32/sys-root/mingw \ CROSS_PATH=/usr/i686-w64-mingw32/sys-root/mingw \
LIBDCDEVEL=../libdivecomputer \
LIBMARBLEDEVEL=../marble \ LIBMARBLEDEVEL=../marble \
LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api \ LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api \
$BASEDIR/../../subsurface.pro $BASEDIR/../../subsurface.pro

2
scripts/win-ldd.pl
View file

@ -51,7 +51,7 @@ for (@ARGV) {
next if /^-/; next if /^-/;
if (-d $_) { if (-d $_) {
push @searchdirs, $_; push @searchdirs, $_;
} elsif (-f $_) { } elsif (-f $_ && ! /\.a$/) {
# Add $_'s path to the search list too # Add $_'s path to the search list too
my $dirname = $_; my $dirname = $_;
$dirname =~ s,/[^/]+$,,; $dirname =~ s,/[^/]+$,,;