From: Juho Vähä-Herttua Date: Sat, 19 May 2012 13:15:34 +0000 (+0300) Subject: Fix the Qt4 bindings and link to libshairport dynamically X-Git-Tag: upstream/0.9.0~4^2~62 X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=92fcb6ac601a2c034a3ab47209d80b5e137a376c;p=deb_shairplay.git Fix the Qt4 bindings and link to libshairport dynamically --- diff --git a/AirTV-Qt/AirTV.pro b/AirTV-Qt/AirTV.pro index 8c896c5..53c3ee7 100644 --- a/AirTV-Qt/AirTV.pro +++ b/AirTV-Qt/AirTV.pro @@ -17,53 +17,28 @@ win32 { LIBS += C:\\QtSDK\\mingw\\lib\\libws2_32.a QMAKE_LFLAGS += -static-libgcc } -unix:!macx { - LIBS += -ldns_sd -} macx { QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 } +LIBS += -lshairplay INCLUDEPATH += ../src/include/ ../src/bindings/qt4/ SOURCES += main.cpp\ - ../src/lib/utils.c \ - ../src/lib/sdp.c \ - ../src/lib/rsapem.c \ - ../src/lib/rsakey.c \ - ../src/lib/raop.c \ - ../src/lib/raop_rtp.c \ - ../src/lib/raop_buffer.c \ - ../src/lib/netutils.c \ - ../src/lib/httpd.c \ - ../src/lib/http_response.c \ - ../src/lib/http_request.c \ - ../src/lib/http_parser.c \ - ../src/lib/dnssd.c \ - ../src/lib/base64.c \ - ../src/lib/alac/alac.c \ - ../src/lib/crypto/sha1.c \ - ../src/lib/crypto/rc4.c \ - ../src/lib/crypto/md5.c \ - ../src/lib/crypto/hmac.c \ - ../src/lib/crypto/bigint.c \ - ../src/lib/crypto/aes.c \ - ../src/lib/logger.c \ - ../src/lib/digest.c \ - audiooutput.cpp \ - mainapplication.cpp \ - audiocallbacks.cpp \ ../src/bindings/qt4/raopservice.cpp \ ../src/bindings/qt4/raopcallbackhandler.cpp \ - ../src/bindings/qt4/dnssdservice.cpp + ../src/bindings/qt4/dnssdservice.cpp \ + audiooutput.cpp \ + mainapplication.cpp \ + audiocallbacks.cpp HEADERS += \ - audiooutput.h \ - mainapplication.h \ - audiocallbacks.h \ ../src/bindings/qt4/raopservice.h \ ../src/bindings/qt4/raopcallbacks.h \ ../src/bindings/qt4/raopcallbackhandler.h \ - ../src/bindings/qt4/dnssdservice.h + ../src/bindings/qt4/dnssdservice.h \ + audiooutput.h \ + mainapplication.h \ + audiocallbacks.h FORMS += mainwindow.ui @@ -85,3 +60,4 @@ RESOURCES += \ + diff --git a/src/bindings/qt4/dnssdservice.h b/src/bindings/qt4/dnssdservice.h index a2ee573..02b4460 100644 --- a/src/bindings/qt4/dnssdservice.h +++ b/src/bindings/qt4/dnssdservice.h @@ -3,7 +3,7 @@ #include -#include "dnssd.h" +#include class DnssdService : public QObject { diff --git a/src/bindings/qt4/raopservice.cpp b/src/bindings/qt4/raopservice.cpp index 2656ad2..d570b43 100644 --- a/src/bindings/qt4/raopservice.cpp +++ b/src/bindings/qt4/raopservice.cpp @@ -4,8 +4,6 @@ #include #include -#include - #define RSA_KEY \ "-----BEGIN RSA PRIVATE KEY-----\n"\ "MIIEpQIBAAKCAQEA59dE8qLieItsH1WgjrcFRKj6eUWqi+bGLOX1HL3U3GhC/j0Qg90u3sG/1CUt\n"\ diff --git a/src/bindings/qt4/raopservice.h b/src/bindings/qt4/raopservice.h index 6531e03..3d663e4 100644 --- a/src/bindings/qt4/raopservice.h +++ b/src/bindings/qt4/raopservice.h @@ -3,9 +3,9 @@ #include -#include "raopcallbacks.h" +#include -#include "raop.h" +#include "raopcallbacks.h" class RaopService : public QObject { @@ -20,7 +20,7 @@ public: void stop(); private: - raop_t * m_raop; + raop_t * m_raop; signals: