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

Fix OS X linking problem and plugin loading on OS X and Windows.

Browse Source
This commit is contained in:
Alejandro Wainzinger 2010-12-12 21:41:43 -08:00
parent d74dd577fd
commit e882c4f0a9
2 changed files with 16 additions and 0 deletions

12
src/sip/SipHandler.cpp

@ -28,6 +28,18 @@ SipHandler::loadPlugins()
qDebug() << TomahawkApp::instance()->applicationDirPath();
QDir pluginsDir( TomahawkApp::instance()->applicationDirPath() );
#if defined(Q_OS_WIN)
if (pluginsDir.dirName().toLower() == "debug" || pluginsDir.dirName().toLower() == "release")
pluginsDir.cdUp();
#elif defined(Q_OS_MAC)
if (pluginsDir.dirName() == "MacOS") {
pluginsDir.cdUp();
pluginsDir.cdUp();
pluginsDir.cdUp();
}
#endif
pluginsDir.cd("plugins");
foreach ( QString fileName, pluginsDir.entryList( QDir::Files ) )
{
QPluginLoader loader( pluginsDir.absoluteFilePath( fileName ) );

4
src/sip/jabber/CMakeLists.txt

@ -27,4 +27,8 @@ target_link_libraries( sip_jabber
${GLOOX_LIBS}
)
IF( APPLE )
SET( CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-undefined dynamic_lookup" )
ENDIF( APPLE )
install( TARGETS sip_jabber DESTINATION . )