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

Merge branch 'win'

Browse Source
This commit is contained in:
Dominik Schmidt
2011-02-15 05:53:27 +01:00
parent f87b36b8d7 053fa4220c
commit 39e2393b07
6 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@@ -28,7 +28,6 @@ SET( TOMAHAWK_INC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../include/" )
SET( tomahawkSources ${tomahawkSources} SET( tomahawkSources ${tomahawkSources}
sip/SipHandler.cpp sip/SipHandler.cpp
sip/twitter/tomahawkoauthtwitter.cpp
infosystem/infosystem.cpp infosystem/infosystem.cpp
infosystem/infoplugins/echonestplugin.cpp infosystem/infoplugins/echonestplugin.cpp
@@ -71,7 +70,6 @@ SET( tomahawkHeaders ${tomahawkHeaders}
"${TOMAHAWK_INC_DIR}/tomahawk/infosystem.h" "${TOMAHAWK_INC_DIR}/tomahawk/infosystem.h"
sip/SipHandler.h sip/SipHandler.h
sip/twitter/tomahawkoauthtwitter.h
infosystem/infoplugins/echonestplugin.h infosystem/infoplugins/echonestplugin.h
infosystem/infoplugins/musixmatchplugin.h infosystem/infoplugins/musixmatchplugin.h

8
src/CMakeLists.win32.txt
View File

@@ -8,12 +8,18 @@ ADD_DEFINITIONS( -static-libgcc )
SET( OS_SPECIFIC_LINK_LIBRARIES SET( OS_SPECIFIC_LINK_LIBRARIES
${OS_SPECIFIC_LINK_LIBRARIES} ${OS_SPECIFIC_LINK_LIBRARIES}
#internal deps
sip_twitter
${CMAKE_BINARY_DIR}/src/libtomahawk/libtomahawklib.dll
# normal deps # normal deps
${LIBLASTFM_LIBRARY} ${LIBLASTFM_LIBRARY}
${GLOOX_LIBS} ${GLOOX_LIBS}
# third party shipped with tomahawk # third party shipped with tomahawk
${CMAKE_BINARY_DIR}/src/libtomahawk/libtomahawklib.dll ${CMAKE_BINARY_DIR}/thirdparty/qtweetlib/libtomahawk_qtweetlib.dll
# fix them, they should be in ${CMAKE_BINARY_DIR} as well
${CMAKE_SOURCE_DIR}/rtaudio/librtaudio.dll ${CMAKE_SOURCE_DIR}/rtaudio/librtaudio.dll
${CMAKE_SOURCE_DIR}/qxt/qxtweb-standalone/libqxtweb-standalone.dll ${CMAKE_SOURCE_DIR}/qxt/qxtweb-standalone/libqxtweb-standalone.dll

2
src/scanmanager.h
View File

@@ -8,7 +8,7 @@
class MusicScanner; class MusicScanner;
class QThread; class QThread;
class DLLEXPORT ScanManager : public QObject class ScanManager : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:

13
src/sip/twitter/CMakeLists.txt
View File

@@ -13,7 +13,7 @@ set( twitterSources
set( twitterHeaders set( twitterHeaders
twitter.h twitter.h
tomahawkoauthtwitter.h tomahawkoauthtwitter.h
) )
include_directories( . ${CMAKE_CURRENT_BINARY_DIR} .. include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ..
@@ -26,16 +26,17 @@ add_library( sip_twitter SHARED ${twitterSources} ${twitterMoc} )
IF( WIN32 ) IF( WIN32 )
SET( OS_SPECIFIC_LINK_LIBRARIES SET( OS_SPECIFIC_LINK_LIBRARIES
${OS_SPECIFIC_LINK_LIBRARIES} ${OS_SPECIFIC_LINK_LIBRARIES}
"winmm.dll" "winmm.dll"
"iphlpapi.a" "iphlpapi.a"
"${CMAKE_CURRENT_SOURCE_DIR}/../../../build/src/libtomahawk/libtomahawklib.dll" "${CMAKE_BINARY_DIR}/thirdparty/qtweetlib/libtomahawk_qtweetlib.dll"
"${CMAKE_BINARY_DIR}/src/libtomahawk/libtomahawklib.dll"
) )
ENDIF( WIN32 ) ENDIF( WIN32 )
target_link_libraries( sip_twitter target_link_libraries( sip_twitter
${QT_LIBRARIES} ${QT_LIBRARIES}
${OS_SPECIFIC_LINK_LIBRARIES} ${OS_SPECIFIC_LINK_LIBRARIES}
) )
IF( APPLE ) IF( APPLE )

1
thirdparty/qtweetlib/CMakeLists.txt vendored
View File

@@ -12,6 +12,7 @@ add_definitions( -DQT_SHARED )
if(WIN32) if(WIN32)
set(PLATFORM_SPECIFIC_LIBS "ws2_32.dll" "advapi32.dll" ) set(PLATFORM_SPECIFIC_LIBS "ws2_32.dll" "advapi32.dll" )
add_definitions( -DQTWEETLIB_MAKEDLL )
endif(WIN32) endif(WIN32)
set(TOMAHAWK_QTWEETLIB_SOURCES set(TOMAHAWK_QTWEETLIB_SOURCES

7
thirdparty/qtweetlib/qtweetlib/src/oauth.h vendored
View File

@@ -40,8 +40,11 @@ class QTWEETLIBSHARED_EXPORT OAuth : public QObject
public: public:
OAuth(QObject *parent = 0); OAuth(QObject *parent = 0);
OAuth(const QByteArray& consumerKey, const QByteArray& consumerSecret, QObject *parent = 0); OAuth(const QByteArray& consumerKey, const QByteArray& consumerSecret, QObject *parent = 0);
#undef GET
enum HttpMethod {GET, POST, PUT, DELETE}; #undef POST
#undef PUT
#undef DELETE
enum HttpMethod {GET, POST, PUT, DELETE};
void parseTokens(const QByteArray& response); void parseTokens(const QByteArray& response);
QByteArray generateAuthorizationHeader(const QUrl& url, HttpMethod method); QByteArray generateAuthorizationHeader(const QUrl& url, HttpMethod method);