diff --git a/src/sip/SipHandler.cpp b/src/sip/SipHandler.cpp index e5ef7fb05..4101d110d 100644 --- a/src/sip/SipHandler.cpp +++ b/src/sip/SipHandler.cpp @@ -29,10 +29,7 @@ SipHandler::loadPlugins() { QDir pluginsDir( qApp->applicationDirPath() ); - #if defined(Q_OS_WIN) - if ( pluginsDir.dirName().toLower() == "debug" || pluginsDir.dirName().toLower() == "release" ) - pluginsDir.cdUp(); - #elif defined(Q_OS_MAC) + #if defined(Q_OS_MAC) if ( pluginsDir.dirName() == "MacOS" ) { pluginsDir.cdUp(); @@ -40,16 +37,18 @@ SipHandler::loadPlugins() pluginsDir.cdUp(); } #endif - pluginsDir.cd( "plugins" ); +// pluginsDir.cd( "plugins" ); foreach ( QString fileName, pluginsDir.entryList( QDir::Files ) ) { + qDebug() << "Trying to load plugin:" << pluginsDir.absoluteFilePath( fileName ); + QPluginLoader loader( pluginsDir.absoluteFilePath( fileName ) ); QObject* plugin = loader.instance(); if ( plugin ) { // Connect via that plugin - qDebug() << "Trying to load plugin:" << loader.fileName(); + qDebug() << "Loaded plugin:" << loader.fileName(); loadPlugin( plugin ); } } @@ -62,8 +61,6 @@ SipHandler::loadPlugin( QObject* plugin ) SipPlugin* sip = qobject_cast(plugin); if ( sip ) { - qDebug() << "Loaded plugin!"; - QObject::connect( sip, SIGNAL( peerOnline( QString ) ), SLOT( onPeerOnline( QString ) ) ); QObject::connect( sip, SIGNAL( peerOffline( QString ) ), SLOT( onPeerOffline( QString ) ) ); QObject::connect( sip, SIGNAL( msgReceived( QString, QString ) ), SLOT( onMessage( QString, QString ) ) ); diff --git a/src/sip/jabber/CMakeLists.txt b/src/sip/jabber/CMakeLists.txt index 6407ceec8..36591508e 100644 --- a/src/sip/jabber/CMakeLists.txt +++ b/src/sip/jabber/CMakeLists.txt @@ -24,8 +24,15 @@ qt4_wrap_cpp( jabberMoc ${jabberHeaders} ) add_library( sip_jabber SHARED ${jabberSources} ${jabberMoc} ) IF( WIN32 ) +SET( GLOOX_LIBS + ${GLOOX_LIBS} + gloox +) + SET( OS_SPECIFIC_LINK_LIBRARIES ${OS_SPECIFIC_LINK_LIBRARIES} + "secur32.dll" + "crypt32.dll" "${CMAKE_CURRENT_SOURCE_DIR}/../../../build/src/libtomahawk/libtomahawklib.dll" ) ENDIF( WIN32 ) diff --git a/src/sip/zeroconf/CMakeLists.txt b/src/sip/zeroconf/CMakeLists.txt index 18b784669..13e483bfa 100644 --- a/src/sip/zeroconf/CMakeLists.txt +++ b/src/sip/zeroconf/CMakeLists.txt @@ -25,6 +25,8 @@ add_library( sip_zeroconf SHARED ${zeroconfSources} ${zeroconfMoc} ) IF( WIN32 ) SET( OS_SPECIFIC_LINK_LIBRARIES ${OS_SPECIFIC_LINK_LIBRARIES} + "winmm.dll" + "iphlpapi.a" "${CMAKE_CURRENT_SOURCE_DIR}/../../../build/src/libtomahawk/libtomahawklib.dll" ) ENDIF( WIN32 )