mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 19:30:21 +02:00
Code Issues Releases Wiki Activity

Have proper visibility of the libraries instead of assuming it's only needed on WIN32

Browse Source
This commit is contained in:
Jeff Mitchell
2011-03-24 15:54:57 -04:00
parent 5ce659fb00
commit 6d92d158bb
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libtomahawk/dllmacro.h
View File

@@ -19,14 +19,14 @@
#ifndef DLLMACRO_H #ifndef DLLMACRO_H
#define DLLMACRO_H #define DLLMACRO_H
#ifdef WIN32 #include <QtCore/qglobal.h>
#ifdef DLLEXPORT_PRO
#define DLLEXPORT __declspec(dllexport) #ifndef DLLEXPORT
#else # if defined (DLLEXPORT_PRO)
#define DLLEXPORT __declspec(dllimport) # define DLLEXPORT Q_DECL_EXPORT
#endif # else
#else # define DLLEXPORT Q_DECL_IMPORT
#define DLLEXPORT # endif
#endif #endif
#endif #endif

4
thirdparty/qtweetlib/CMakeLists.txt vendored
View File

@@ -9,10 +9,10 @@ INCLUDE( ${QT_USE_FILE} )
add_definitions( ${QT_DEFINITIONS} ) add_definitions( ${QT_DEFINITIONS} )
add_definitions( -DQT_SHARED ) add_definitions( -DQT_SHARED )
add_definitions( -DQTWEETLIB_MAKEDLL )
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
@@ -176,8 +176,6 @@ target_link_libraries(tomahawk_qtweetlib
qjson qjson
) )
#SET_TARGET_PROPERTIES( tomahawk_qtweetlib PROPERTIES DEFINE_SYMBOL MAKE_QTWEETLIB_LIB )
INCLUDE( ${CMAKE_CURRENT_SOURCE_DIR}/twitter-api-keys ) INCLUDE( ${CMAKE_CURRENT_SOURCE_DIR}/twitter-api-keys )
INSTALL(TARGETS tomahawk_qtweetlib DESTINATION lib${LIB_SUFFIX}) INSTALL(TARGETS tomahawk_qtweetlib DESTINATION lib${LIB_SUFFIX})