enable speex on meego/harmattan

2 files changed, 9 insertions, 4 deletions

diff --git a/qxmpp.pri b/qxmpp.pri
index 1b37e4f9..f0994f1d 100644
--- a/qxmpp.pri
+++ b/qxmpp.pri
@@ -2,7 +2,6 @@
 
 QT += network xml
 QXMPP_INCLUDEPATH = $$PWD/src/base $$PWD/src/client $$PWD/src/server
-QXMPP_LIBRARY_DIR = $$PWD/lib
 
 CONFIG(debug, debug|release) {
     QXMPP_LIBRARY_NAME = qxmpp_d
@@ -11,7 +10,13 @@ CONFIG(debug, debug|release) {
 }
 
 # Libraries used internally by QXmpp
-symbian {
+android|symbian {
+
+} else:contains(MEEGO_EDITION,harmattan) {
+    # meego/harmattan has speex for sure
+    QXMPP_INTERNAL_DEFINES += QXMPP_USE_SPEEX
+    QXMPP_INTERNAL_LIBS += -lspeex
+} else:symbian {
     QXMPP_INTERNAL_INCLUDES = $$APP_LAYER_SYSTEMINCLUDE
     QXMPP_INTERNAL_LIBS = -lesock
 } else:win32 {
diff --git a/src/src.pro b/src/src.pro
index 293d27ec..0203a720 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -5,11 +5,11 @@ QT -= gui
 TEMPLATE = lib
 
 CONFIG += staticlib
+DEFINES += QT_STATICPLUGIN
+DEFINES += $$QXMPP_INTERNAL_DEFINES
 INCLUDEPATH += $$QXMPP_INCLUDEPATH $$QXMPP_INTERNAL_INCLUDES
 LIBS += $$QXMPP_INTERNAL_LIBS
 
-DEFINES += QT_STATICPLUGIN
-
 # To enable support for the Speex audio codec, uncomment the following:
 # DEFINES += QXMPP_USE_SPEEX
 # LIBS += -lspeex