mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-20 12:52:30 +02:00
Code Issues Releases Wiki Activity

* Further win32 fixes.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-01-04 10:40:43 +01:00
parent 318ed169eb
commit 65914c9d64
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/sip/SipHandler.cpp
View File

@@ -29,10 +29,7 @@ SipHandler::loadPlugins()
{ {
QDir pluginsDir( qApp->applicationDirPath() ); QDir pluginsDir( qApp->applicationDirPath() );
#if defined(Q_OS_WIN) #if defined(Q_OS_MAC)
if ( pluginsDir.dirName().toLower() == "debug" || pluginsDir.dirName().toLower() == "release" )
pluginsDir.cdUp();
#elif defined(Q_OS_MAC)
if ( pluginsDir.dirName() == "MacOS" ) if ( pluginsDir.dirName() == "MacOS" )
{ {
pluginsDir.cdUp(); pluginsDir.cdUp();
@@ -40,16 +37,18 @@ SipHandler::loadPlugins()
pluginsDir.cdUp(); pluginsDir.cdUp();
} }
#endif #endif
pluginsDir.cd( "plugins" ); // pluginsDir.cd( "plugins" );
foreach ( QString fileName, pluginsDir.entryList( QDir::Files ) ) foreach ( QString fileName, pluginsDir.entryList( QDir::Files ) )
{ {
qDebug() << "Trying to load plugin:" << pluginsDir.absoluteFilePath( fileName );
QPluginLoader loader( pluginsDir.absoluteFilePath( fileName ) ); QPluginLoader loader( pluginsDir.absoluteFilePath( fileName ) );
QObject* plugin = loader.instance(); QObject* plugin = loader.instance();
if ( plugin ) if ( plugin )
{ {
// Connect via that plugin // Connect via that plugin
qDebug() << "Trying to load plugin:" << loader.fileName(); qDebug() << "Loaded plugin:" << loader.fileName();
loadPlugin( plugin ); loadPlugin( plugin );
} }
} }
@@ -62,8 +61,6 @@ SipHandler::loadPlugin( QObject* plugin )
SipPlugin* sip = qobject_cast<SipPlugin*>(plugin); SipPlugin* sip = qobject_cast<SipPlugin*>(plugin);
if ( sip ) if ( sip )
{ {
qDebug() << "Loaded plugin!";
QObject::connect( sip, SIGNAL( peerOnline( QString ) ), SLOT( onPeerOnline( QString ) ) ); QObject::connect( sip, SIGNAL( peerOnline( QString ) ), SLOT( onPeerOnline( QString ) ) );
QObject::connect( sip, SIGNAL( peerOffline( QString ) ), SLOT( onPeerOffline( QString ) ) ); QObject::connect( sip, SIGNAL( peerOffline( QString ) ), SLOT( onPeerOffline( QString ) ) );
QObject::connect( sip, SIGNAL( msgReceived( QString, QString ) ), SLOT( onMessage( QString, QString ) ) ); QObject::connect( sip, SIGNAL( msgReceived( QString, QString ) ), SLOT( onMessage( QString, QString ) ) );

7
src/sip/jabber/CMakeLists.txt
View File

@@ -24,8 +24,15 @@ qt4_wrap_cpp( jabberMoc ${jabberHeaders} )
add_library( sip_jabber SHARED ${jabberSources} ${jabberMoc} ) add_library( sip_jabber SHARED ${jabberSources} ${jabberMoc} )
IF( WIN32 ) IF( WIN32 )
SET( GLOOX_LIBS
${GLOOX_LIBS}
gloox
)
SET( OS_SPECIFIC_LINK_LIBRARIES SET( OS_SPECIFIC_LINK_LIBRARIES
${OS_SPECIFIC_LINK_LIBRARIES} ${OS_SPECIFIC_LINK_LIBRARIES}
"secur32.dll"
"crypt32.dll"
"${CMAKE_CURRENT_SOURCE_DIR}/../../../build/src/libtomahawk/libtomahawklib.dll" "${CMAKE_CURRENT_SOURCE_DIR}/../../../build/src/libtomahawk/libtomahawklib.dll"
) )
ENDIF( WIN32 ) ENDIF( WIN32 )

2
src/sip/zeroconf/CMakeLists.txt
View File

@@ -25,6 +25,8 @@ add_library( sip_zeroconf SHARED ${zeroconfSources} ${zeroconfMoc} )
IF( WIN32 ) IF( WIN32 )
SET( OS_SPECIFIC_LINK_LIBRARIES SET( OS_SPECIFIC_LINK_LIBRARIES
${OS_SPECIFIC_LINK_LIBRARIES} ${OS_SPECIFIC_LINK_LIBRARIES}
"winmm.dll"
"iphlpapi.a"
"${CMAKE_CURRENT_SOURCE_DIR}/../../../build/src/libtomahawk/libtomahawklib.dll" "${CMAKE_CURRENT_SOURCE_DIR}/../../../build/src/libtomahawk/libtomahawklib.dll"
) )
ENDIF( WIN32 ) ENDIF( WIN32 )