mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-03-18 23:09:42 +01:00
Fix windows
This commit is contained in:
parent
751af7862c
commit
82c77e64c6
@ -32,7 +32,7 @@ include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ..
|
||||
qt4_wrap_cpp( twitterAccountMoc ${twitterAccountHeaders} )
|
||||
qt4_wrap_ui( twitterAccountUI_H ${twitterAccountUI} )
|
||||
qt4_add_resources( RC_SRCS "resources.qrc" )
|
||||
add_library( tomahawk_account_twitter SHARED ${twitterAccountUI_H} ${twitterAccountSources} ${twitterAccountMoc} ${RC_SRCS} )
|
||||
add_library( tomahawk_account_twitter MODULE ${twitterAccountUI_H} ${twitterAccountSources} ${twitterAccountMoc} ${RC_SRCS} )
|
||||
|
||||
IF( WIN32 )
|
||||
SET( OS_SPECIFIC_LINK_LIBRARIES
|
||||
|
@ -52,7 +52,7 @@ public:
|
||||
Account* createAccount( const QString& pluginId = QString() );
|
||||
};
|
||||
|
||||
class DLLEXPORT TwitterAccount : public Account
|
||||
class ACCOUNTDLLEXPORT TwitterAccount : public Account
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
@ -19,7 +19,7 @@
|
||||
#ifndef TWITTERACCOUNTCONFIGWIDGET_H
|
||||
#define TWITTERACCOUNTCONFIGWIDGET_H
|
||||
|
||||
#include "dllmacro.h"
|
||||
#include "accounts/accountdllmacro.h"
|
||||
|
||||
#include <QTweetLib/qtweetstatus.h>
|
||||
#include <QTweetLib/qtweetdmstatus.h>
|
||||
@ -42,7 +42,7 @@ namespace Accounts
|
||||
class TwitterAccount;
|
||||
|
||||
|
||||
class DLLEXPORT TwitterConfigWidget : public QWidget
|
||||
class ACCOUNTDLLEXPORT TwitterConfigWidget : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
@ -37,7 +37,7 @@ include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ..
|
||||
qt4_wrap_cpp( xmppAccountMoc ${xmppAccountHeaders} )
|
||||
qt4_wrap_ui( xmppAccountUI_H ${xmppAccountUI} )
|
||||
qt4_add_resources( RC_SRCS "resources.qrc" )
|
||||
add_library( tomahawk_account_xmpp SHARED ${xmppAccountUI_H} ${xmppAccountSources} ${xmppAccountMoc} ${RC_SRCS} )
|
||||
add_library( tomahawk_account_xmpp MODULE ${xmppAccountUI_H} ${xmppAccountSources} ${xmppAccountMoc} ${RC_SRCS} )
|
||||
|
||||
IF( WIN32 )
|
||||
SET( OS_SPECIFIC_LINK_LIBRARIES
|
||||
|
@ -25,7 +25,7 @@ add_definitions(-DGOOGLE_WRAPPER)
|
||||
qt4_add_resources( RCX_SRCS "resources.qrc" )
|
||||
|
||||
qt4_wrap_cpp( googleMoc ${googleHeaders} )
|
||||
add_library( tomahawk_account_google SHARED ${googleSources} ${googleMoc} ${googleMoc} ${RCX_SRCS} )
|
||||
add_library( tomahawk_account_google MODULE ${googleSources} ${googleMoc} ${googleMoc} ${RCX_SRCS} )
|
||||
|
||||
target_link_libraries( tomahawk_account_google
|
||||
${QT_LIBRARIES}
|
||||
|
@ -54,7 +54,7 @@ public:
|
||||
Account* createAccount( const QString& pluginId = QString() );
|
||||
};
|
||||
|
||||
class DLLEXPORT XmppAccount : public Account
|
||||
class ACCOUNTDLLEXPORT XmppAccount : public Account
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
@ -19,7 +19,7 @@
|
||||
#ifndef JABBERACCOUNTCONFIGWIDGET_H
|
||||
#define JABBERACCOUNTCONFIGWIDGET_H
|
||||
|
||||
#include "dllmacro.h"
|
||||
#include "accounts/accountdllmacro.h"
|
||||
|
||||
#include <QWidget>
|
||||
|
||||
@ -38,7 +38,7 @@ class XmppAccount;
|
||||
class GoogleWrapper;
|
||||
|
||||
|
||||
class DLLEXPORT XmppConfigWidget : public QWidget
|
||||
class ACCOUNTDLLEXPORT XmppConfigWidget : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
@ -4,7 +4,7 @@ include( ${QT_USE_FILE} )
|
||||
add_definitions( ${QT_DEFINITIONS} )
|
||||
add_definitions( -DQT_PLUGIN )
|
||||
add_definitions( -DQT_SHARED )
|
||||
add_definitions( -DSIPDLLEXPORT_PRO )
|
||||
add_definitions( -DACCOUNTDLLEXPORT_PRO )
|
||||
|
||||
set( zeroconfSources
|
||||
zeroconf.cpp
|
||||
@ -24,7 +24,7 @@ include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ..
|
||||
qt4_wrap_ui( UI_SRCS configwidget.ui )
|
||||
qt4_add_resources( RC_SRCS "resources.qrc" )
|
||||
qt4_wrap_cpp( zeroconfMoc ${zeroconfHeaders} )
|
||||
add_library( tomahawk_account_zeroconf SHARED ${zeroconfSources} ${zeroconfMoc} ${RC_SRCS} ${UI_SRCS} )
|
||||
add_library( tomahawk_account_zeroconf MODULE ${zeroconfSources} ${zeroconfMoc} ${RC_SRCS} ${UI_SRCS} )
|
||||
|
||||
IF( WIN32 )
|
||||
SET( OS_SPECIFIC_LINK_LIBRARIES
|
||||
|
@ -30,6 +30,7 @@
|
||||
|
||||
#include "database/database.h"
|
||||
#include "network/servent.h"
|
||||
#include "accounts/accountdllmacro.h"
|
||||
|
||||
class Node : public QObject
|
||||
{
|
||||
@ -59,7 +60,7 @@ public slots:
|
||||
emit tomahawkHostFound( ip, port, "Unknown", nid );
|
||||
this->deleteLater();
|
||||
}
|
||||
|
||||
|
||||
void resolve()
|
||||
{
|
||||
QHostInfo::lookupHost( ip, this, SLOT( resolved( QHostInfo ) ) );
|
||||
@ -72,7 +73,7 @@ private:
|
||||
};
|
||||
|
||||
|
||||
class TomahawkZeroconf : public QObject
|
||||
class ACCOUNTDLLEXPORT TomahawkZeroconf : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user