mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-04-13 12:31:52 +02:00
Have proper visibility of the libraries instead of assuming it's only needed on WIN32
This commit is contained in:
parent
5ce659fb00
commit
6d92d158bb
@ -19,14 +19,14 @@
|
||||
#ifndef DLLMACRO_H
|
||||
#define DLLMACRO_H
|
||||
|
||||
#ifdef WIN32
|
||||
#ifdef DLLEXPORT_PRO
|
||||
#define DLLEXPORT __declspec(dllexport)
|
||||
#else
|
||||
#define DLLEXPORT __declspec(dllimport)
|
||||
#endif
|
||||
#else
|
||||
#define DLLEXPORT
|
||||
#include <QtCore/qglobal.h>
|
||||
|
||||
#ifndef DLLEXPORT
|
||||
# if defined (DLLEXPORT_PRO)
|
||||
# define DLLEXPORT Q_DECL_EXPORT
|
||||
# else
|
||||
# define DLLEXPORT Q_DECL_IMPORT
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
4
thirdparty/qtweetlib/CMakeLists.txt
vendored
4
thirdparty/qtweetlib/CMakeLists.txt
vendored
@ -9,10 +9,10 @@ INCLUDE( ${QT_USE_FILE} )
|
||||
|
||||
add_definitions( ${QT_DEFINITIONS} )
|
||||
add_definitions( -DQT_SHARED )
|
||||
add_definitions( -DQTWEETLIB_MAKEDLL )
|
||||
|
||||
if(WIN32)
|
||||
set(PLATFORM_SPECIFIC_LIBS "ws2_32.dll" "advapi32.dll" )
|
||||
add_definitions( -DQTWEETLIB_MAKEDLL )
|
||||
endif(WIN32)
|
||||
|
||||
set(TOMAHAWK_QTWEETLIB_SOURCES
|
||||
@ -176,8 +176,6 @@ target_link_libraries(tomahawk_qtweetlib
|
||||
qjson
|
||||
)
|
||||
|
||||
#SET_TARGET_PROPERTIES( tomahawk_qtweetlib PROPERTIES DEFINE_SYMBOL MAKE_QTWEETLIB_LIB )
|
||||
|
||||
INCLUDE( ${CMAKE_CURRENT_SOURCE_DIR}/twitter-api-keys )
|
||||
|
||||
INSTALL(TARGETS tomahawk_qtweetlib DESTINATION lib${LIB_SUFFIX})
|
||||
|
Loading…
x
Reference in New Issue
Block a user