[PATCH] Link static to libdivecomputer

[Henrik Brautaset Aronsen]

Did we link statically to libdivecomputer in the Qt branch?  We didn't do
that for the GTK branch...

Henrik


On Wed, Oct 9, 2013 at 2:30 PM, Anton Lundin <glance at acc.umu.se> wrote:

> Forgot to add a sob, so add one before applying.
>
> I'm also sending a patch that adds a
> -Wl,-rpath=../libdivecomputer/src/.libs if we would like to dynamic link
> instead of static as before. Chose the one that fits best.
>
> //Anton
>
> On 09 October, 2013 - Anton Lundin wrote:
>
> > In previous build system we linked static to libdivecomputer, so start
> > doing that again.
> > ---
> >  subsurface-configure.pri | 7 ++++++-
> >  1 file changed, 6 insertions(+), 1 deletion(-)
> >
> > diff --git a/subsurface-configure.pri b/subsurface-configure.pri
> > index 7836594..c1eef76 100644
> > --- a/subsurface-configure.pri
> > +++ b/subsurface-configure.pri
> > @@ -30,7 +30,12 @@ system(pkg-config --version 2>$$NUL >$$NUL) {
> >  !isEmpty(LIBDCDEVEL) {
> >      # find it next to our sources
> >      INCLUDEPATH += ../libdivecomputer/include
> > -    LIBS += -L../libdivecomputer/src/.libs -ldivecomputer
> > +    LIBS += ../libdivecomputer/src/.libs/libdivecomputer.a
> > +    # Libusb-1.0 is only required if libdivecomputer was built with it.
> > +    # And libdivecomputer is only built with it if libusb-1.0 is
> > +    # installed. So get libusb if it exists, but don't complain
> > +    # about it if it doesn't.
> > +    LIBS += $$system(pkg-config --libs libusb-1.0 2> /dev/null)
> >  } else:exists(/usr/local/lib/libdivecomputer.a) {
> >      LIBS += -L/usr/local/lib -ldivecomputer
> >  } else:exists(/usr/local/lib64/libdivecomputer.a) {
> > --
> > 1.8.1.2
>
> --
> Anton Lundin    +46702-161604
> _______________________________________________
> subsurface mailing list
> subsurface at hohndel.org
> http://lists.hohndel.org/cgi-bin/mailman/listinfo/subsurface
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.hohndel.org/pipermail/subsurface/attachments/20131009/85de2d57/attachment-0001.html>